fix(deps): EOL replace commons-collections 3.2.2 with commons-collections4 4.5.0 (issue #86)

deliverytiersuite/delivery-tier-suite/DTS-shared-dependencies/pom.xml

@@ -434,10 +434,6 @@
                     <groupId>org.javassist</groupId>
                     <artifactId>javassist</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>commons-collections</groupId>
-                    <artifactId>commons-collections</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>xml-apis</groupId>
                     <artifactId>xml-apis</artifactId>
@@ -453,10 +449,6 @@
             <artifactId>hibernate-ehcache</artifactId>
             <version>${hibernate.version}</version>
             <exclusions>
-                <exclusion>
-                    <groupId>commons-collections</groupId>
-                    <artifactId>commons-collections</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
@@ -604,11 +596,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.2</version>
-        </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>

deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/pom.xml

@@ -630,10 +630,6 @@
                                 <groupId>net.sf.ehcache</groupId>
                                 <artifactId>ehcache-core</artifactId>
                             </dependency>
-                            <dependency>
-                                <groupId>commons-collections</groupId>
-                                <artifactId>commons-collections</artifactId>
-                            </dependency>
                             <dependency>
                                 <groupId>com.percussion</groupId>
                                 <artifactId>servlet-utils</artifactId>

deliverytiersuite/delivery-tier-suite/metadata/src/main/java/com/percussion/delivery/metadata/data/impl/PSCriteriaElement.java

@@ -21,7 +21,7 @@
 import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 
 /** @author erikserating */

deliverytiersuite/delivery-tier-suite/tomcat-common/pom.xml

@@ -65,10 +65,6 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>commons-collections</groupId>
-                    <artifactId>commons-collections</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>commons-betwixt</groupId>
                     <artifactId>commons-betwixt</artifactId>

deployer/pom.xml

@@ -65,10 +65,6 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

deployer/src/main/java/com/percussion/deployer/server/dependencies/PSContentListDefDependencyHandler.java

@@ -55,8 +55,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.MapIterator;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
 import org.apache.commons.lang3.StringUtils;
 
 /**

deployer/src/main/java/com/percussion/deployer/server/dependencies/PSContentTypeDependencyHandler.java

@@ -88,7 +88,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

deployer/src/main/java/com/percussion/deployer/server/dependencies/PSDependencyUtils.java

@@ -74,7 +74,7 @@
 import java.util.Map;
 import java.util.Set;
 import javax.persistence.Table;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;

deployer/src/main/java/com/percussion/deployer/server/dependencies/PSPublisherServiceHelper.java

@@ -32,8 +32,8 @@
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.map.HashedMap;
 
 /**
  * A util class to interface msm with the Publisher service

deployer/src/main/java/com/percussion/rx/config/impl/PSConfigUtils.java

@@ -62,7 +62,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;

deployer/src/main/java/com/percussion/rx/config/impl/PSContentTypeFieldSetter.java

@@ -48,8 +48,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.IteratorUtils;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -321,8 +321,11 @@ private void updateSharedGroup(PSItemDefinition itemDef, String fieldName) {
 
     // update excludes
     ArrayList<String> excNames = new ArrayList<>();
-    Iterator excludes = mapper.getSharedFieldExcludes();
-    CollectionUtils.addAll(excNames, excludes);
+    // commons-collections4 dropped `CollectionUtils.addAll(Collection, Iterator)`;
+    // `mapper.getSharedFieldExcludes()` returns raw Iterator, so we cast.
+    @SuppressWarnings("unchecked")
+    Iterator<String> excludes = mapper.getSharedFieldExcludes();
+    while (excludes.hasNext()) excNames.add(excludes.next());
     for (PSField f : shGroup.getFieldSet().getAllFields()) excNames.add(f.getSubmitName());
 
     mapper.setSharedFieldExcludes(excNames);

deployer/src/main/java/com/percussion/rx/config/impl/PSContentTypeSetter.java

@@ -45,7 +45,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -337,8 +337,9 @@ private void removeSharedGroup(PSItemDefinition itemDef, PSSharedFieldGroup shGr
   @SuppressWarnings("unchecked")
   private ArrayList<String> iteratorToList(Iterator it) {
     ArrayList<String> list = new ArrayList<>();
-    CollectionUtils.addAll(list, it);
-
+    // commons-collections4 dropped `CollectionUtils.addAll(Collection, Iterator)`; loop
+    // instead. The raw `Iterator` means each element needs to be cast to String.
+    while (it.hasNext()) list.add((String) it.next());
     return list;
   }
 

modules/CMLight-Main-cactus-tests/pom.xml

@@ -201,11 +201,6 @@
             <artifactId>commons-beanutils</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/rx/config/test/PSContentTypeSetterTest.java

@@ -46,7 +46,7 @@
 import com.percussion.utils.guid.IPSGuid;
 import com.percussion.utils.testing.IntegrationTest;
 import com.percussion.utils.types.PSPair;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.experimental.categories.Category;
 

modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/assembly/data/PSAssemblyTemplateTest.java

@@ -33,7 +33,7 @@
 import com.percussion.utils.types.PSPair;
 import junit.framework.JUnit4TestAdapter;
 import org.apache.cactus.ServletTestCase;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.hibernate.SessionFactory;

modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/filestorage/impl/PSHashedFieldCatalogerTest.java

@@ -28,7 +28,7 @@
 
 import com.percussion.utils.testing.IntegrationTest;
 import org.apache.cactus.ServletTestCase;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 

modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/system/PSAssignmentTypeHelperTest.java

@@ -42,7 +42,7 @@
 import com.percussion.utils.guid.IPSGuid;
 import com.percussion.utils.request.PSRequestInfo;
 import com.percussion.utils.testing.IntegrationTest;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.AfterClass;

modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/services/utils/jspel/PSItemUtilitiesTest.java

@@ -22,7 +22,7 @@
 
 import com.percussion.utils.testing.IntegrationTest;
 import org.apache.cactus.ServletTestCase;
-import org.apache.commons.collections.MultiMap;
+import org.apache.commons.collections4.MultiValuedMap;
 import org.junit.experimental.categories.Category;
 
 /**
@@ -36,7 +36,7 @@ public class PSItemUtilitiesTest extends ServletTestCase
    @SuppressWarnings("unchecked")
    public void testSiteInfo()
    {
-      MultiMap info = PSItemUtilities.getItemSiteInfo(376);
+      MultiValuedMap info = PSItemUtilities.getItemSiteInfo(376);
       assertEquals(1, info.size());
 
       Collection folders = info.values();

modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/webservices/content/PSContentDesignWsTest.java

@@ -39,7 +39,7 @@
 
 import com.percussion.utils.testing.IntegrationTest;
 import org.apache.cactus.ServletTestCase;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
 import org.junit.experimental.categories.Category;
 
 /**

modules/CMLight-Main-cactus-tests/src/test/java/com/percussion/workflow/PSWorkflowRoleInfoTest.java

@@ -26,7 +26,7 @@
 import com.percussion.webservices.security.IPSSecurityWs;
 import com.percussion.webservices.security.PSSecurityWsLocator;
 import org.apache.cactus.ServletTestCase;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.junit.experimental.categories.Category;
 
 import java.sql.Connection;

modules/ContentUI/src/main/java/com/percussion/content/ui/aa/PSAAClientServlet.java

@@ -27,7 +27,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 
 /**

modules/ContentUI/src/main/java/com/percussion/content/ui/aa/actions/impl/PSGetUrlAction.java

@@ -85,7 +85,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/TableFactory/pom.xml

@@ -104,11 +104,6 @@
             <artifactId>xml-apis</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

modules/TableFactory/src/main/java/com/percussion/tablefactory/PSJdbcImportExportHelper.java

@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 public class PSJdbcImportExportHelper {

modules/extensions-main/pom.xml

@@ -54,10 +54,6 @@
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

modules/extensions-main/src/main/java/com/percussion/uicontext/PSGenerateVariantList.java

@@ -61,8 +61,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Transformer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.w3c.dom.Document;

modules/extensions-sfp/pom.xml

@@ -34,11 +34,6 @@
             <artifactId>log4j-1.2-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>

modules/extensions-sfp/src/main/java/com/percussion/fastforward/calendar/PSCalendarMonthModel.java

@@ -28,8 +28,8 @@
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
-import org.apache.commons.collections.MultiHashMap;
-import org.apache.commons.collections.MultiMap;
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.logging.log4j.LogManager;
@@ -190,7 +190,7 @@ public void setEvents(List<IPSAssemblyResult> events) {
       getModel().m_eventsByDay = null;
     } else {
       PSCalendarMonthModel model = getModel();
-      model.m_eventsByDay = new MultiHashMap();
+      model.m_eventsByDay = new ArrayListValuedHashMap();
       for (IPSAssemblyResult event : events) {
         Node event_node = event.getNode();
         if (event_node != null) {
@@ -253,5 +253,5 @@ private PSCalendarMonthModel getModel() {
    * A mapping of events, keyed by day of the month (Integer), returning a list of
    * IPSAssemblyResult. Will be <code>null</code> until setEvents is called.
    */
-  private MultiMap m_eventsByDay;
+  private MultiValuedMap m_eventsByDay;
 }

modules/jcadf-master/pom.xml

@@ -15,8 +15,8 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

modules/jcadf-master/src/main/java/com/ibm/cadf/model/FederatedCredential.java

@@ -21,7 +21,7 @@
 import com.ibm.cadf.exception.CADFException;
 import java.text.MessageFormat;
 import java.util.List;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 public class FederatedCredential extends Credential {

modules/perc-exceptions-spring/pom.xml

@@ -29,10 +29,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.percussion</groupId>
             <artifactId>rxutils</artifactId>

modules/perc-exceptions-spring/src/main/java/com/percussion/share/validation/PSErrorCause.java

@@ -22,7 +22,7 @@
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;