You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2007/02/25 23:10:45 UTC
svn commit: r511639 - in /jackrabbit/trunk: contrib/jcr-navigator/pom.xml
jackrabbit-webapp/pom.xml jackrabbit-webdav/pom.xml
Author: jukka
Date: Sun Feb 25 14:10:44 2007
New Revision: 511639
URL: http://svn.apache.org/viewvc?view=rev&rev=511639
Log:
JCR-717: Move the commons-httpclient/commons-logging exclusion from jackrabbit-webdav to jackrabbit-webapp.' */pom.xml
Modified:
jackrabbit/trunk/contrib/jcr-navigator/pom.xml
jackrabbit/trunk/jackrabbit-webapp/pom.xml
jackrabbit/trunk/jackrabbit-webdav/pom.xml
Modified: jackrabbit/trunk/contrib/jcr-navigator/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jcr-navigator/pom.xml?view=diff&rev=511639&r1=511638&r2=511639
==============================================================================
--- jackrabbit/trunk/contrib/jcr-navigator/pom.xml (original)
+++ jackrabbit/trunk/contrib/jcr-navigator/pom.xml Sun Feb 25 14:10:44 2007
@@ -27,13 +27,13 @@
<!-- POM Identification -->
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jcr-browser</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>jcr-navigator</artifactId>
+ <version>1.3-SNAPSHOT</version>
<packaging>war</packaging>
- <name>JCR Browser</name>
+ <name>JCR Navigator</name>
- <description>JCR Browser</description>
+ <description>JCR Navigator</description>
<!-- Dependencies -->
@@ -107,8 +107,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>1.1-SNAPSHOT</version>
- <scope>compile</scope>
+ <version>${version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.derby</groupId>
@@ -128,8 +127,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
- <version>1.1-SNAPSHOT</version>
- <scope>compile</scope>
+ <version>${version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.derby</groupId>
@@ -149,8 +147,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webapp</artifactId>
- <version>1.1-SNAPSHOT</version>
- <scope>compile</scope>
+ <version>${version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.derby</groupId>
@@ -171,8 +168,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jcr-commands</artifactId>
- <version>1.1-SNAPSHOT</version>
- <scope>compile</scope>
+ <version>${version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.derby</groupId>
@@ -192,8 +188,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jcr-taglib</artifactId>
- <version>1.1-SNAPSHOT</version>
- <scope>compile</scope>
+ <version>${version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.derby</groupId>
Modified: jackrabbit/trunk/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/pom.xml?view=diff&rev=511639&r1=511638&r2=511639
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webapp/pom.xml Sun Feb 25 14:10:44 2007
@@ -57,6 +57,17 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
<version>${pom.version}</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>
@@ -66,6 +77,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <!-- JCR-683: Use jcl104-over-slf4j instead of the commons-logging -->
+ <!-- dependency excluded above -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
<version>1.3.0</version>
</dependency>
<dependency>
Modified: jackrabbit/trunk/jackrabbit-webdav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/pom.xml?view=diff&rev=511639&r1=511638&r2=511639
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-webdav/pom.xml Sun Feb 25 14:10:44 2007
@@ -94,18 +94,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
</exclusions>
- </dependency>
- <!-- JCR-683: Use jcl104-over-slf4j instead of the commons-logging -->
- <!-- dependency excluded above -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.3.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>