You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jb...@apache.org on 2012/01/30 11:29:34 UTC
svn commit: r1237592 - in /archiva/trunk:
archiva-modules/archiva-karaf/archiva-features/pom.xml
archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
pom.xml
Author: jbonofre
Date: Mon Jan 30 10:29:34 2012
New Revision: 1237592
URL: http://svn.apache.org/viewvc?rev=1237592&view=rev
Log:
[MRM-1596] Upgrade to commons-collections 3.2.1
Modified:
archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml
archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml?rev=1237592&r1=1237591&r2=1237592&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml Mon Jan 30 10:29:34 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml?rev=1237592&r1=1237591&r2=1237592&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml (original)
+++ archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml Mon Jan 30 10:29:34 2012
@@ -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>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1237592&r1=1237591&r2=1237592&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Jan 30 10:29:34 2012
@@ -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>