diff options
| author | Jean-Baptiste Onofre <jbonofre@apache.org> | 2012-01-30 10:29:34 +0000 |
|---|---|---|
| committer | Jean-Baptiste Onofre <jbonofre@apache.org> | 2012-01-30 10:29:34 +0000 |
| commit | 0f83609027298a0c2f62cbe6aba14a5c74d27a52 (patch) | |
| tree | ee165180cbfa7f7670f892d2d2b8005071a98de5 | |
| parent | f34fd437014c1b7989bde1af087542c14280ff26 (diff) | |
| download | archiva-0f83609027298a0c2f62cbe6aba14a5c74d27a52.tar.gz archiva-0f83609027298a0c2f62cbe6aba14a5c74d27a52.zip | |
[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
| -rw-r--r-- | archiva-modules/archiva-karaf/archiva-features/pom.xml | 1 | ||||
| -rw-r--r-- | archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml index f45a44083..c2fc2e72e 100644 --- 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 246fca19d..b877f7be3 100644 --- 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> @@ -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> |