You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/10/27 15:32:53 UTC
svn commit: r1869040 - in /jackrabbit/oak/branches/1.4: ./
oak-examples/webapp/ oak-examples/webapp/pom.xml oak-parent/pom.xml
oak-run/pom.xml oak-solr-osgi/pom.xml
Author: reschke
Date: Sun Oct 27 15:32:53 2019
New Revision: 1869040
URL: http://svn.apache.org/viewvc?rev=1869040&view=rev
Log:
OAK-7622: Update httpcomponent dependencies to 4.4.10/4.5.6 (and declare the versions globally) (merged r1835521 into 1.4)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-examples/webapp/ (props changed)
jackrabbit/oak/branches/1.4/oak-examples/webapp/pom.xml
jackrabbit/oak/branches/1.4/oak-parent/pom.xml
jackrabbit/oak/branches/1.4/oak-run/pom.xml
jackrabbit/oak/branches/1.4/oak-solr-osgi/pom.xml
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1835521
Propchange: jackrabbit/oak/branches/1.4/oak-examples/webapp/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-examples/webapp:r1835521
Modified: jackrabbit/oak/branches/1.4/oak-examples/webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-examples/webapp/pom.xml?rev=1869040&r1=1869039&r2=1869040&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-examples/webapp/pom.xml Sun Oct 27 15:32:53 2019
@@ -183,6 +183,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j.version}</version>
Modified: jackrabbit/oak/branches/1.4/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-parent/pom.xml?rev=1869040&r1=1869039&r2=1869040&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-parent/pom.xml Sun Oct 27 15:32:53 2019
@@ -592,6 +592,31 @@
<artifactId>jackson-dataformat-smile</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>4.4.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.5.6</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: jackrabbit/oak/branches/1.4/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-run/pom.xml?rev=1869040&r1=1869039&r2=1869040&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-run/pom.xml Sun Oct 27 15:32:53 2019
@@ -434,12 +434,10 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.2</version>
</dependency>
<!-- jackson libs -->
Modified: jackrabbit/oak/branches/1.4/oak-solr-osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-solr-osgi/pom.xml?rev=1869040&r1=1869039&r2=1869040&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-solr-osgi/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-solr-osgi/pom.xml Sun Oct 27 15:32:53 2019
@@ -222,19 +222,16 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.6</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.3.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.3.6</version>
<scope>runtime</scope>
</dependency>
<dependency>