jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r884647 - in /jackrabbit/trunk: jackrabbit-webapp/pom.xml jackrabbit-webdav/pom.xml
Date Thu, 26 Nov 2009 17:05:50 GMT
Author: jukka
Date: Thu Nov 26 17:05:49 2009
New Revision: 884647

URL: http://svn.apache.org/viewvc?rev=884647&view=rev
Log:
JCR-2411: Replace commons-logging with jcl-over-slf4j in jackrabbit-webdav

Modified:
    jackrabbit/trunk/jackrabbit-webapp/pom.xml
    jackrabbit/trunk/jackrabbit-webdav/pom.xml

Modified: jackrabbit/trunk/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/pom.xml?rev=884647&r1=884646&r2=884647&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/pom.xml Thu Nov 26 17:05:49 2009
@@ -58,17 +58,6 @@
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-server</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <exclusions>
-        <!-- JCR-683: The commons-httpclient dependency from            -->
-        <!-- jackrabbit-webapp depends on commons-logging. Since this   -->
-        <!-- webapp uses log4j (see the slf4j-log4j12 dependency below) -->
-        <!-- for logging, we need to override this dependency with the  -->
-        <!-- jcl104-over-sflf4j dependency given below.                 -->
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
@@ -82,12 +71,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
-    <!-- JCR-683: Use jcl104-over-slf4j instead of the commons-logging -->
-    <!-- dependency excluded above                                     -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>

Modified: jackrabbit/trunk/jackrabbit-webdav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/pom.xml?rev=884647&r1=884646&r2=884647&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webdav/pom.xml Thu Nov 26 17:05:49 2009
@@ -76,7 +76,20 @@
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
+      <exclusions>
+        <!-- JCR-2411: Replace commons-logging with jcl-over-slf4j -->
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
+    <!-- JCR-2411: Replace commons-logging with jcl-over-slf4j -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>



Mime
View raw message