Author: veithen
Date: Sun Jun 5 10:50:43 2016
New Revision: 1746897
URL: http://svn.apache.org/viewvc?rev=1746897&view=rev
Log:
AXIS2-5757: Merge r1746883, r1746889 and r1746894 to the 1.7 branch to upgrade
httpclient to the latest version.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml
axis/axis2/java/core/branches/1_7/modules/transport/http/pom.xml
axis/axis2/java/core/branches/1_7/pom.xml
axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 5 10:50:43 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894
Modified: axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml?rev=1746897&r1=1746896&r2=1746897&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml Sun Jun 5
10:50:43 2016
@@ -81,10 +81,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
Modified: axis/axis2/java/core/branches/1_7/modules/transport/http/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/http/pom.xml?rev=1746897&r1=1746896&r2=1746897&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/http/pom.xml Sun Jun 5
10:50:43 2016
@@ -87,10 +87,6 @@
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
Modified: axis/axis2/java/core/branches/1_7/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/pom.xml?rev=1746897&r1=1746896&r2=1746897&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/pom.xml Sun Jun 5 10:50:43 2016
@@ -505,8 +505,7 @@
<geronimo.spec.saaj.version>1.0.1</geronimo.spec.saaj.version>
<geronimo.spec.jaxws.version>1.0</geronimo.spec.jaxws.version>
<google.gson.version>2.1</google.gson.version>
- <httpcore.version>4.2.5</httpcore.version>
- <httpclient.version>4.2.5</httpclient.version>
+ <httpclient.version>4.5.2</httpclient.version>
<intellij.version>5.0</intellij.version>
<jalopy.version>1.5rc3</jalopy.version>
<jaxb.api.version>2.2.6</jaxb.api.version>
@@ -821,11 +820,6 @@
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
Modified: axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml?rev=1746897&r1=1746896&r2=1746897&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml Sun Jun 5
10:50:43 2016
@@ -56,16 +56,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.1</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
