SAK-49906 Remove old commons-collection (sakaiproject#12473)

Amos09 · Mar 29, 2024 · cbf7496 · cbf7496
1 parent bde0701
commit cbf7496
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 42 deletions.
diff --git a/admin-su/pom.xml b/admin-su/pom.xml
@@ -41,8 +41,8 @@
       <artifactId>commons-digester</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>

diff --git a/chat/chat-tool/tool/pom.xml b/chat/chat-tool/tool/pom.xml
@@ -89,8 +89,8 @@
       <artifactId>commons-digester</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>

diff --git a/deploy/pom.xml b/deploy/pom.xml
@@ -639,11 +639,6 @@
             <artifactId>commons-codec</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>

diff --git a/hierarchy/impl/pom.xml b/hierarchy/impl/pom.xml
@@ -116,8 +116,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/jobscheduler/scheduler-tool/pom.xml b/jobscheduler/scheduler-tool/pom.xml
@@ -75,8 +75,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/jsf/jsf-tool-sun/pom.xml b/jsf/jsf-tool-sun/pom.xml
@@ -65,8 +65,8 @@
             <artifactId>commons-digester</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>

diff --git a/jsf/myfaces-tool/pom.xml b/jsf/myfaces-tool/pom.xml
@@ -63,8 +63,8 @@
             <artifactId>commons-digester</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>

diff --git a/jsf2/jsf2-tool-sun/pom.xml b/jsf2/jsf2-tool-sun/pom.xml
@@ -65,8 +65,8 @@
             <artifactId>commons-digester</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>

diff --git a/master/pom.xml b/master/pom.xml
@@ -714,12 +714,6 @@
         <version>3.3.0</version>
         <scope>provided</scope>
       </dependency>
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.2.2</version>
-        <scope>provided</scope>
-      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-collections4</artifactId>

diff --git a/portal/portal-render-engine-impl/impl/pom.xml b/portal/portal-render-engine-impl/impl/pom.xml
@@ -60,8 +60,8 @@
         </dependency>
         <!-- required for unit tests -->
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>jtidy</groupId>

diff --git a/rwiki/rwiki-tool/tool/pom.xml b/rwiki/rwiki-tool/tool/pom.xml
@@ -144,8 +144,8 @@
       <artifactId>sakai-velocity-util</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/search/search-tool/tool/pom.xml b/search/search-tool/tool/pom.xml
@@ -96,8 +96,8 @@
       <artifactId>sakai-velocity-util</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
     </dependency>
     <dependency>
         <groupId>org.apache.commons</groupId>

diff --git a/signup/impl/pom.xml b/signup/impl/pom.xml
@@ -78,8 +78,8 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-validator</groupId>

diff --git a/sitestats/sitestats-impl/pom.xml b/sitestats/sitestats-impl/pom.xml
@@ -160,6 +160,10 @@
         </dependency>
 
         <!-- Apache Commons -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -229,11 +233,6 @@
             <artifactId>commons-codec</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache-core</artifactId>

diff --git a/user/user-tool-admin-prefs/admin-prefs/pom.xml b/user/user-tool-admin-prefs/admin-prefs/pom.xml
@@ -43,8 +43,8 @@
       <artifactId>commons-digester</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>

diff --git a/user/user-tool-prefs/tool/pom.xml b/user/user-tool-prefs/tool/pom.xml
@@ -76,8 +76,8 @@
       <artifactId>commons-digester</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>