[MRM-459] prune the distributed dependencies

Removing commons-logging-api everywhere
Removing slf4j-simple
Removing velocity-dep

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

diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
index 66ef5ec9cb3159449c072845423dfde986de9d6f..464e88348a99e1e39a7f3f254ea5235ef68320a4 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-api</artifactId>
+      <artifactId>commons-logging</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-api</additionalCoreArtifact>
+            <additionalCoreArtifact>commons-logging:commons-logging</additionalCoreArtifact>
             <additionalCoreArtifact>log4j:log4j</additionalCoreArtifact>
             <additionalCoreArtifact>org.apache.derby:derby</additionalCoreArtifact>
             <additionalCoreArtifact>org.codehaus.plexus:plexus-naming</additionalCoreArtifact>

diff --git a/pom.xml b/pom.xml
index 39c90e752844cb285dd237af03363e4888cfa466..d03101a1e28d4bb204789311ff51577b90feb5fa 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -356,11 +356,6 @@
         <artifactId>commons-logging</artifactId>
         <version>1.0.4</version>
       </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging-api</artifactId>
-        <version>1.0.4</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>
         <artifactId>derby</artifactId>
@@ -544,6 +539,12 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-slf4j-logging</artifactId>
         <version>1.1-alpha-1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -559,6 +560,12 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-xwork-integration</artifactId>
         <version>1.0-alpha-7</version>
+        <exclusions>
+          <exclusion>
+            <groupId>velocity</groupId>
+            <artifactId>velocity-dep</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus.cache</groupId>
@@ -653,6 +660,10 @@
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>