jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1853194 - in /jackrabbit/branches/2.18: ./ jackrabbit-webapp/pom.xml jackrabbit-webdav/pom.xml
Date Fri, 08 Feb 2019 08:38:50 GMT
Author: reschke
Date: Fri Feb  8 08:38:50 2019
New Revision: 1853194

URL: http://svn.apache.org/viewvc?rev=1853194&view=rev
Log:
JCR-4408: jackrabbit-webapp: test dependency for httpcore breaks war file - make the dependency
explicit in jackrabbit-webdav (ported to 2.18)

Modified:
    jackrabbit/branches/2.18/   (props changed)
    jackrabbit/branches/2.18/jackrabbit-webapp/pom.xml
    jackrabbit/branches/2.18/jackrabbit-webdav/pom.xml

Propchange: jackrabbit/branches/2.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  8 08:38:50 2019
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904
+/jackrabbit/trunk:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946

Modified: jackrabbit/branches/2.18/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-webapp/pom.xml?rev=1853194&r1=1853193&r2=1853194&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.18/jackrabbit-webapp/pom.xml Fri Feb  8 08:38:50 2019
@@ -60,6 +60,10 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -138,12 +142,6 @@
       <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-      <version>4.4.11</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

Modified: jackrabbit/branches/2.18/jackrabbit-webdav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-webdav/pom.xml?rev=1853194&r1=1853193&r2=1853194&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-webdav/pom.xml (original)
+++ jackrabbit/branches/2.18/jackrabbit-webdav/pom.xml Fri Feb  8 08:38:50 2019
@@ -71,6 +71,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.4.11</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <version>4.5.6</version>
     </dependency>



Mime
View raw message