You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/11/08 16:43:02 UTC
svn commit: r593206 - in /maven/archiva/trunk:
archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml pom.xml
Author: joakime
Date: Thu Nov 8 07:42:58 2007
New Revision: 593206
URL: http://svn.apache.org/viewvc?rev=593206&view=rev
Log:
[MRM-459] prune the distributed dependencies
Removing commons-logging-api everywhere
Removing slf4j-simple
Removing velocity-dep
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml?rev=593206&r1=593205&r2=593206&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml Thu Nov 8 07:42:58 2007
@@ -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>
Modified: maven/archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=593206&r1=593205&r2=593206&view=diff
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Thu Nov 8 07:42:58 2007
@@ -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>
@@ -652,6 +659,10 @@
<exclusion>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
</exclusion>
</exclusions>
</dependency>