[MRM-1596] Upgrade to commons-collections 3.2.1

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1237592 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml
index f45a440832aea6bed9e7029677b5bc1aa1fe7ff6..c2fc2e72ea278e66a4624e06e03d2bb1d041b19b 100644 (file)
--- a/archiva-modules/archiva-karaf/archiva-features/pom.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml
@@ -34,7 +34,6 @@
     <beanlib.bundle.version>5.0.2beta_1-SNAPSHOT</beanlib.bundle.version>
     <cglib.bundle.version>2.2_2</cglib.bundle.version>
     <commons-beanutils.bundle.version>1.8.2_2</commons-beanutils.bundle.version>
-    <commons-collections.bundle.version>3.2.1_2</commons-collections.bundle.version>
     <commons-configuration.bundle.version>1.4_3</commons-configuration.bundle.version>
     <commons-digester.bundle.version>1.8_3</commons-digester.bundle.version>
     <commons-httpclient.bundle.version>3.1_6</commons-httpclient.bundle.version>

diff --git a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
index 246fca19d4a5f83c49913f530c3fbc78f37bb800..b877f7be34d767a906108f034670974029df7c72 100644 (file)
--- a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
@@ -50,7 +50,7 @@
     <feature version="${project.version}">archiva-policies</feature>
     <feature>http</feature>
     <feature version="[3,4)">spring-web</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
     <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/${commons-digester.bundle.version}</bundle>

diff --git a/pom.xml b/pom.xml
index 48f587086832570d2eb1587aa0838cbdd167371a..4aca7f8d206ad768d7886e200c29b78381083374 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,7 @@
     <!-- Note: when upgrading to 2.3.1+, template/xhtml can be removed from the
          webapp resources -->
     <commons-codec.version>1.6</commons-codec.version>
+    <commons-collections.version>3.2.1</commons-collections.version>
     <commons-fileupload.version>1.2.2</commons-fileupload.version>
     <commons-lang.version>2.6</commons-lang.version>
     <struts.version>2.2.3.1</struts.version>
@@ -576,7 +577,7 @@
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
-        <version>3.2</version>
+        <version>${commons-collections.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-fileupload</groupId>