Merge pull request #1880 from jbonofre/KARAF-7853

Cleanup commons-collections dependency
apache · Nov 6, 2024 · a8d9901 · a8d9901
2 parents 5a8d99f + 0ba29ae
commit a8d9901
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 24 deletions.
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -84,7 +84,7 @@
     <feature name="spring-struts" description="Spring 3.1.x Struts support" version="${spring31.version}">
         <feature version="[${spring31.version},3.2)">spring-web</feature>
         <feature>pax-web-war</feature>
-        <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+        <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/3.2.2</bundle>
         <bundle dependency="true" start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
         <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
         <bundle start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -1545,11 +1545,6 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>${commons-lang3.version}</version>
             </dependency>
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>${commons-collections.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>

diff --git a/etc/appended-resources/supplemental-models.xml b/etc/appended-resources/supplemental-models.xml
@@ -313,23 +313,6 @@
       </licenses>
     </project>
   </supplement>
-  <supplement>
-    <project>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <name>Apache Commons Collections</name>
-      <organization>
-        <name>The Apache Software Foundation</name>
-        <url>http://www.apache.org/</url>
-      </organization>
-      <licenses>
-        <license>
-          <name>The Apache Software License, Version 2.0</name>
-          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
   <supplement>
     <project>
       <groupId>commons-jexl</groupId>

diff --git a/pom.xml b/pom.xml
@@ -179,7 +179,6 @@
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <commons-codec.version>1.15</commons-codec.version>
         <commons-compress.version>1.27.1</commons-compress.version>
-        <commons-collections.version>3.2.2</commons-collections.version>
         <commons-fileupload.version>1.5</commons-fileupload.version>
         <commons-lang3.version>3.17.0</commons-lang3.version>
         <commons-logging.version>1.3.4</commons-logging.version>