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 2019/04/17 16:54:50 UTC
svn commit: r1857698 - in /jackrabbit/branches/2.16: ./
jackrabbit-webapp/pom.xml jackrabbit-webdav/pom.xml
Author: reschke
Date: Wed Apr 17 16:54:49 2019
New Revision: 1857698
URL: http://svn.apache.org/viewvc?rev=1857698&view=rev
Log:
JCR-4408: jackrabbit-webapp: test dependency for httpcore breaks war file - make the dependency explicit in jackrabbit-webdav (ported to 2.16)
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml
jackrabbit/branches/2.16/jackrabbit-webdav/pom.xml
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 17 16:54:49 2019
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1820753,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831182,1831854,1831860,1832058,1832090,1832177,1833374,1833835,1833891,1834008,1834308,1834315,1834401,1834418,1834424,1834673,1834922,1835445,1835448,1835459,1836341,1836349,1836620,1836722,1836729,1836731,1836733,1836773,1836776,1836778,1836794,1836800,1839647,1839910,1839924,1839931,1839937,1839945,1839964,1839966,1840007,1840027,1841459,1841858,1841865,1841916-1841917,1841924,1843392,1843995,1844000,1844014,1844030,1844036,1844067,1844252,1846665,1846896,1847167,1850224,1851360,1851369,1851372,1851380,1851384,1851904,1856855
+/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1820753,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831182,1831854,1831860,1832058,1832090,1832177,1833374,1833835,1833891,1834008,1834308,1834315,1834401,1834418,1834424,1834673,1834922,1835445,1835448,1835459,1836341,1836349,1836620,1836722,1836729,1836731,1836733,1836773,1836776,1836778,1836794,1836800,1839647,1839910,1839924,1839931,1839937,1839945,1839964,1839966,1840007,1840027,1841459,1841858,1841865,1841916-1841917,1841924,1843392,1843995,1844000,1844014,1844030,1844036,1844067,1844252,1846665,1846896,1847167,1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1856855
Modified: jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml?rev=1857698&r1=1857697&r2=1857698&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml Wed Apr 17 16:54:49 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.16/jackrabbit-webdav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-webdav/pom.xml?rev=1857698&r1=1857697&r2=1857698&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-webdav/pom.xml (original)
+++ jackrabbit/branches/2.16/jackrabbit-webdav/pom.xml Wed Apr 17 16:54:49 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>