[MRM-1597] Upgrade to commons-io 2.1

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1237605 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 c2fc2e72ea278e66a4624e06e03d2bb1d041b19b..ae95df65ecbe5e0e2ff171d6000572b129bbadc9 100644 (file)
--- a/archiva-modules/archiva-karaf/archiva-features/pom.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml
@@ -37,8 +37,6 @@
     <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>
-    <commons-io.2.version>2.0.1</commons-io.2.version>
-    <commons-io.bundle.version>1.4_2</commons-io.bundle.version>
     <commons-jxpath.bundle.version>1.2_5</commons-jxpath.bundle.version>
     <commons-validator.bundle.version>1.3.1_1-SNAPSHOT</commons-validator.bundle.version>
     <dom4j.bundle.version>1.6.1_4</dom4j.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 b877f7be34d767a906108f034670974029df7c72..99e2a5f31f256a2b126242e0c8c70c8dd8376cc9 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
@@ -33,7 +33,7 @@
 
   <feature name="archiva-checksum" description="Archiva Checksum module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-common</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-checksum/${project.version}</bundle>
   </feature>
 
@@ -78,7 +78,7 @@
 
   <feature name="archiva-repository-admin-api" description="Archiva Repository Admin API module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-common</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">wrap:mvn:org.codehaus.redback/redback-users-api/${redback.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-configuration/${redback.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-policy/${redback.version}</bundle>
@@ -100,8 +100,8 @@
 
   <feature name="archiva-xml-tools" description="Archiva XML Tools module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-common</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-xml-tools/${project.version}</bundle>
@@ -129,7 +129,7 @@
     <bundle dependency="true">wrap:mvn:org.apache.maven.indexer/indexer-core/${maven.indexer.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.maven.indexer/indexer-artifact/${maven.indexer.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
-    <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.velocity/${velocity.bundle.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-velocity/${plexus-velocity.version}</bundle>
     <bundle dependency="true">wrap:mvn:net.sourceforge.jchardet/jchardet/${jcharset.version}</bundle>
@@ -140,8 +140,8 @@
 
   <feature name="archiva-consumers-api" description="Archiva Consumers API module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-repository-admin-api</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-consumer-api/${project.version}</bundle>
   </feature>
 
@@ -170,8 +170,8 @@
     <feature version="${project.version}">archiva-repository-admin-api</feature>
     <feature version="${project.version}">archiva-maven2-repository</feature>
     <feature version="${project.version}">archiva-model</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-repository-layer/${project.version}</bundle>
@@ -179,8 +179,8 @@
 
   <feature name="archiva-proxy-common" description="Archiva Proxy Common module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-plexus-bridge</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.maven.wagon/wagon-provider-api/${wagon.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.maven.wagon/wagon-file/${wagon.version}</bundle>
     <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient.version}</bundle>
@@ -251,13 +251,13 @@
 
   <feature name="archiva-transaction" description="Archiva Transaction module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-plexus-bridge</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-transaction/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-artifact-converter" description="Archiva Artifact Converter module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-transaction</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.maven/maven-model-v3/${maven-model-v3.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.maven/maven-model/${maven3x.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.maven.shared/maven-model-converter/${maven-model-converter.version}</bundle>
@@ -270,7 +270,7 @@
     <feature version="${project.version}">archiva-consumers</feature>
     <feature version="${project.version}">archiva-scheduler</feature>
     <feature version="${project.version}">archiva-transaction</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.maven/maven-model-v3/${maven-model-v3.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.maven/maven-model/${maven3x.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.maven.shared/maven-model-converter/${maven-model-converter.version}</bundle>
@@ -281,7 +281,7 @@
   <feature name="archiva-indexer" description="Archiva Indexer module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-repository-admin-api</feature>
     <feature version="${project.version}">archiva-plexus-bridge</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.maven.indexer/indexer-core/${maven.indexer.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-indexer/${project.version}</bundle>
@@ -338,7 +338,7 @@
     <feature version="${project.version}">archiva-proxy</feature>
     <feature version="${project.version}">archiva-security</feature>
     <feature>http</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${joda-time.bundle.version}</bundle>
     <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
@@ -349,7 +349,7 @@
 
   <feature name="archiva-stage-repository-merge" description="Archiva Stage Repository Merge module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-repository-layer</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle>mvn:org.apache.archiva/stage-repository-merge/${project.version}</bundle>
   </feature>
 
@@ -361,7 +361,7 @@
   <feature name="archiva-metadata-store-file" description="Archiva Metadata Store File module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-configuration</feature>
     <feature version="${project.version}">archiva-metadata</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle>mvn:org.apache.archiva/metadata-store-file/${project.version}</bundle>
   </feature>
 
@@ -417,13 +417,13 @@
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.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: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-digester/${commons-digester.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rome/${rome.bundle.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.velocity.tools/velocity-tools/${velocity-tools.version}</bundle>
     <bundle dependency="true">mvn:org.testng/testng/${testng.version}</bundle>
-    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.2.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
     <bundle dependency="true">mvn:commons-fileupload/commons-fileupload/${commons-fileupload.version}</bundle>
     <bundle dependency="true">mvn:org.apache.struts/struts2-core/${struts.version}</bundle>
     <bundle dependency="true">mvn:org.apache.struts.xwork/xwork-core/${struts.version}</bundle>
@@ -432,4 +432,4 @@
     <bundle>mvn:org.apache.archiva/archiva-webapp/${project.version}/war</bundle>
   </feature>
 
-</features>
\ No newline at end of file
+</features>

diff --git a/pom.xml b/pom.xml
index 4aca7f8d206ad768d7886e200c29b78381083374..a76928711ff787165c95d838be873fee772c9881 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
     <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-io.version>2.1</commons-io.version>
     <commons-lang.version>2.6</commons-lang.version>
     <struts.version>2.2.3.1</struts.version>
     <maven3x.version>3.0.3</maven3x.version>
@@ -587,7 +588,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>1.4</version>
+        <version>${commons-io.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>