[MRM-459] better rationalisation of commons-logging and partially revert r593206...

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

diff --git a/archiva-database/pom.xml b/archiva-database/pom.xml
index c5afe2f005aa6fb11fa2c3eb6d8b7b03ade52eca..64f574f60b9ae77d8fdaac21a3970ddbe257a0fd 100755 (executable)
--- a/archiva-database/pom.xml
+++ b/archiva-database/pom.xml
@@ -82,16 +82,6 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>

diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
index 464e88348a99e1e39a7f3f254ea5235ef68320a4..66ef5ec9cb3159449c072845423dfde986de9d6f 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <artifactId>commons-logging-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
@@ -115,7 +115,7 @@
           <runtimeConfigurationProperties>src/plexus.properties</runtimeConfigurationProperties>
           <runtimePath>target/plexus-archiva-runtime</runtimePath>
           <additionalCoreArtifacts>
-            <additionalCoreArtifact>commons-logging:commons-logging</additionalCoreArtifact>
+            <additionalCoreArtifact>commons-logging:commons-logging-api</additionalCoreArtifact>
             <additionalCoreArtifact>log4j:log4j</additionalCoreArtifact>
             <additionalCoreArtifact>org.apache.derby:derby</additionalCoreArtifact>
             <additionalCoreArtifact>org.codehaus.plexus:plexus-naming</additionalCoreArtifact>

diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml
index db05ca8fa141bb6fabbef42b8f71fec7382fe961..392d7cc69f7a96cb8e94ab7a4210882aab25086e 100644 (file)
--- a/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-web/archiva-webapp/pom.xml
@@ -119,11 +119,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>

diff --git a/pom.xml b/pom.xml
index d03101a1e28d4bb204789311ff51577b90feb5fa..accc8e68649bbacf895d485d307b2cd4ece12160 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -353,7 +353,7 @@
       </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
+        <artifactId>commons-logging-api</artifactId>
         <version>1.0.4</version>
       </dependency>
       <dependency>