aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-web
diff options
context:
space:
mode:
authorBrett Porter <brett@apache.org>2007-11-09 03:27:30 +0000
committerBrett Porter <brett@apache.org>2007-11-09 03:27:30 +0000
commiteb76decee7a1b07132471726295aa5d29e55ace5 (patch)
treed76e5d749be97c65a3a9adaf24ae55ca51c9b29c /archiva-web
parent729ad246d2338f662eabb4613cb33ceddd387865 (diff)
downloadarchiva-eb76decee7a1b07132471726295aa5d29e55ace5.tar.gz
archiva-eb76decee7a1b07132471726295aa5d29e55ace5.zip
[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
Diffstat (limited to 'archiva-web')
-rw-r--r--archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml4
-rw-r--r--archiva-web/archiva-webapp/pom.xml5
2 files changed, 2 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 464e88348..66ef5ec9c 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</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>
diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml
index db05ca8fa..392d7cc69 100644
--- a/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-web/archiva-webapp/pom.xml
@@ -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>