Author: brett
Date: Thu Nov 8 19:27:30 2007
New Revision: 593414
URL: http://svn.apache.org/viewvc?rev=593414&view=rev
Log:
[MRM-459] better rationalisation of commons-logging and partially revert
r593206 as logging had stopped working altogether
Modified:
maven/archiva/trunk/archiva-database/pom.xml
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-database/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/pom.xml?rev=593414&r1=593413&r2=593414&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-database/pom.xml (original)
+++ maven/archiva/trunk/archiva-database/pom.xml Thu Nov 8 19:27:30 2007
@@ -83,16 +83,6 @@
<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>
</dependency>
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=593414&r1=593413&r2=593414&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 19:27:30 2007
@@ -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>
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml?rev=593414&r1=593413&r2=593414&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml Thu Nov 8 19:27:30
2007
@@ -120,11 +120,6 @@
<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>
</dependency>
Modified: maven/archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=593414&r1=593413&r2=593414&view=diff
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Thu Nov 8 19:27:30 2007
@@ -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>
