commons-logging-api is actually required by some client libraries, add back to main...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@674463 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 310f435c9c524fed69360c5cc4ae48d6835de3de..735a37b65439a885591ec92a95c19c9ae5a6f7da 100644 (file)
--- 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 94760b33ffb053fa67c3100617ec4a6a077b5160..133a1210f04f938117e8b049b34ac28b4343104f 100644 (file)
--- 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>