You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/07/07 13:42:38 UTC

svn commit: r674463 - in /archiva/trunk: archiva-modules/archiva-web/archiva-webapp/pom.xml pom.xml

Author: brett
Date: Mon Jul  7 04:42:38 2008
New Revision: 674463

URL: http://svn.apache.org/viewvc?rev=674463&view=rev
Log:
commons-logging-api is actually required by some client libraries, add back to main webapp dependencies

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/trunk/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=674463&r1=674462&r2=674463&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Jul  7 04:42:38 2008
@@ -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>

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=674463&r1=674462&r2=674463&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Jul  7 04:42:38 2008
@@ -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>