This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.4.x by this push:
new adff306244 Cleanup commons-collections dependency
adff306244 is described below
commit adff3062444832856ec9f88b29134aaa97591fd2
Author: JB Onofré <[email protected]>
AuthorDate: Tue Oct 29 06:56:09 2024 +0100
Cleanup commons-collections dependency
(cherry picked from commit 0ba29ae746888468274b85710bc5cdaab9cd2abb)
---
.../features/spring-legacy/src/main/feature/feature.xml | 2 +-
bom/pom.xml | 5 -----
etc/appended-resources/supplemental-models.xml | 17 -----------------
pom.xml | 1 -
4 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml
b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index cb0c0cda5f..c51fa7a4f2 100644
--- 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
index 59058bc31c..1b2b8441e7 100644
--- 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
index b1e24647b9..6af1fd8225 100644
--- 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
index 3a27751c14..72913bbedd 100644
--- 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>
