You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2016/09/09 12:36:16 UTC
svn commit: r1759999 - in /jackrabbit/branches/2.12: ./
jackrabbit-parent/pom.xml jackrabbit-webdav/pom.xml
Author: reschke
Date: Fri Sep 9 12:36:15 2016
New Revision: 1759999
URL: http://svn.apache.org/viewvc?rev=1759999&view=rev
Log:
JCR-4019: move httpclient dependency out of parent pom (ported to 2.12)
Modified:
jackrabbit/branches/2.12/ (props changed)
jackrabbit/branches/2.12/jackrabbit-parent/pom.xml
jackrabbit/branches/2.12/jackrabbit-webdav/pom.xml
Propchange: jackrabbit/branches/2.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 12:36:15 2016
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1732436,1751279,1752165,1753226,1758600,1759607,1759782
+/jackrabbit/trunk:1732436,1751279,1752165,1753226,1758600,1759607,1759782,1759865
Modified: jackrabbit/branches/2.12/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-parent/pom.xml?rev=1759999&r1=1759998&r2=1759999&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.12/jackrabbit-parent/pom.xml Fri Sep 9 12:36:15 2016
@@ -352,18 +352,6 @@
<version>${logback.version}</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <!-- JCR-683: Exclude bad transitive dependencies -->
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>3.6.0</version>
Modified: jackrabbit/branches/2.12/jackrabbit-webdav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/pom.xml?rev=1759999&r1=1759998&r2=1759999&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/pom.xml (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/pom.xml Fri Sep 9 12:36:15 2016
@@ -103,6 +103,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
<exclusions>
<!-- JCR-2411: Replace commons-logging with jcl-over-slf4j -->
<exclusion>