aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Porter <brett@apache.org>2008-07-07 11:42:38 +0000
committerBrett Porter <brett@apache.org>2008-07-07 11:42:38 +0000
commit2a68a704a60725cc1a1ecb359d45f04cb8291b73 (patch)
treee950748817da7cac71cb54224680f0a3be5df681
parent366036cdeecd1923f6dc7648be6ad04d8c2eebfe (diff)
downloadarchiva-2a68a704a60725cc1a1ecb359d45f04cb8291b73.tar.gz
archiva-2a68a704a60725cc1a1ecb359d45f04cb8291b73.zip
commons-logging-api is actually required by some client libraries, add back to main webapp dependencies
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674463 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/pom.xml10
-rw-r--r--pom.xml1
2 files changed, 5 insertions, 6 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 310f435c9..735a37b65 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -216,6 +216,11 @@
<artifactId>wagon-file</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -347,11 +352,6 @@
<artifactId>derby</artifactId>
<version>10.1.3.1</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
- </dependency>
<!-- Enable the following if you want JSP 2.0 or JVM version < 1.5
<dependency>
<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index 94760b33f..133a1210f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,6 @@
<bannedDependencies>
<excludes>
<exclude>org.codehaus.plexus:plexus-container-default</exclude>
- <exclude>commons-logging:commons-logging-api</exclude>
<exclude>commons-logging:commons-logging</exclude>
<exclude>velocity:velocity-dep</exclude>
<exclude>classworlds:classworlds</exclude>