Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-459] better rationalisation of commons-logging and partially revert r593206 as logging had stopped working altogether 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@593414 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2007-11-09 03:27:30 +00:00
parent 729ad246d2
commit eb76decee7
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archiva-database/pom.xml
View File

@ -82,16 +82,6 @@
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
</dependency> </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<exclusions>
<exclusion>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>

4
archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
View File

@ -64,7 +64,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
@ -115,7 +115,7 @@
<runtimeConfigurationProperties>src/plexus.properties</runtimeConfigurationProperties> <runtimeConfigurationProperties>src/plexus.properties</runtimeConfigurationProperties>
<runtimePath>target/plexus-archiva-runtime</runtimePath> <runtimePath>target/plexus-archiva-runtime</runtimePath>
<additionalCoreArtifacts> <additionalCoreArtifacts>
<additionalCoreArtifact>commons-logging:commons-logging</additionalCoreArtifact> <additionalCoreArtifact>commons-logging:commons-logging-api</additionalCoreArtifact>
<additionalCoreArtifact>log4j:log4j</additionalCoreArtifact> <additionalCoreArtifact>log4j:log4j</additionalCoreArtifact>
<additionalCoreArtifact>org.apache.derby:derby</additionalCoreArtifact> <additionalCoreArtifact>org.apache.derby:derby</additionalCoreArtifact>
<additionalCoreArtifact>org.codehaus.plexus:plexus-naming</additionalCoreArtifact> <additionalCoreArtifact>org.codehaus.plexus:plexus-naming</additionalCoreArtifact>

5
archiva-web/archiva-webapp/pom.xml
View File

@ -119,11 +119,6 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
</dependency> </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>

2
pom.xml
View File

@ -353,7 +353,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging-api</artifactId>
<version>1.0.4</version> <version>1.0.4</version>
</dependency> </dependency>
<dependency> <dependency>