1.5: Need to exclude the commons-logging dependency from the correct place (JCR-683)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/1.5@768250 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jackrabbit-webapp/pom.xml b/jackrabbit-webapp/pom.xml
index 6396d59..6bfa88b 100644
--- a/jackrabbit-webapp/pom.xml
+++ b/jackrabbit-webapp/pom.xml
@@ -68,6 +68,11 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
<version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webdav</artifactId>
+ <version>1.5.5</version>
<exclusions>
<!-- JCR-683: The commons-httpclient dependency from -->
<!-- jackrabbit-webapp depends on commons-logging. Since this -->
@@ -82,11 +87,6 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-webdav</artifactId>
- <version>1.5.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-servlet</artifactId>
<version>1.5.2</version>
</dependency>