summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt <joakime@apache.org>2007-11-08 15:42:58 +0000
committerJoakim Erdfelt <joakime@apache.org>2007-11-08 15:42:58 +0000
commit8c35e1bbf2009a9fc2983e7a5f3a8e9456570ae9 (patch)
tree568e7d748fd4fde91d0c0bebb9f82ace136cf57e
parent352479d4c9b7f9ef73dbbc2fb268ef0bfe37ef33 (diff)
downloadarchiva-8c35e1bbf2009a9fc2983e7a5f3a8e9456570ae9.tar.gz
archiva-8c35e1bbf2009a9fc2983e7a5f3a8e9456570ae9.zip
[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
-rw-r--r--archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml4
-rw-r--r--pom.xml21
2 files changed, 18 insertions, 7 deletions
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
index 66ef5ec9c..464e88348 100644
--- 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 39c90e752..d03101a1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,11 +357,6 @@
<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>
<version>10.1.3.1</version>
@@ -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>