From 1587e84b608a7601b0c843fc3a654b0561f464c0 Mon Sep 17 00:00:00 2001 From: Shawn Heisey Date: Fri, 3 Jan 2014 03:14:08 +0000 Subject: [PATCH] SOLR-5590: Upgrade HttpClient/HttpComponents to 4.3.x. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1555004 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/CHANGES.txt | 3 +++ lucene/ivy-versions.properties | 6 +++--- lucene/licenses/httpclient-4.2.6.jar.sha1 | 1 - lucene/licenses/httpclient-4.3.1.jar.sha1 | 1 + lucene/licenses/httpcore-4.2.5.jar.sha1 | 1 - lucene/licenses/httpcore-4.3.jar.sha1 | 1 + solr/CHANGES.txt | 3 +++ solr/licenses/httpclient-4.2.6.jar.sha1 | 1 - solr/licenses/httpclient-4.3.1.jar.sha1 | 1 + solr/licenses/httpcore-4.2.5.jar.sha1 | 1 - solr/licenses/httpcore-4.3.jar.sha1 | 1 + solr/licenses/httpmime-4.2.6.jar.sha1 | 1 - solr/licenses/httpmime-4.3.1.jar.sha1 | 1 + 13 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 lucene/licenses/httpclient-4.2.6.jar.sha1 create mode 100644 lucene/licenses/httpclient-4.3.1.jar.sha1 delete mode 100644 lucene/licenses/httpcore-4.2.5.jar.sha1 create mode 100644 lucene/licenses/httpcore-4.3.jar.sha1 delete mode 100644 solr/licenses/httpclient-4.2.6.jar.sha1 create mode 100644 solr/licenses/httpclient-4.3.1.jar.sha1 delete mode 100644 solr/licenses/httpcore-4.2.5.jar.sha1 create mode 100644 solr/licenses/httpcore-4.3.jar.sha1 delete mode 100644 solr/licenses/httpmime-4.2.6.jar.sha1 create mode 100644 solr/licenses/httpmime-4.3.1.jar.sha1 diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 47e56906982..c9c874d55f0 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -99,6 +99,9 @@ Build * LUCENE-5360: Add support for developing in Netbeans IDE. (Michal Hlavac, Uwe Schindler, Steve Rowe) +* SOLR-5590: Upgrade HttpClient/HttpComponents to 4.3.x. + (Karl Wright via Shawn Heisey) + Bug fixes * LUCENE-5285: Improved highlighting of multi-valued fields with diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index 6169a2f67e4..56936fda607 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -109,9 +109,9 @@ org.apache.hadoop.version = 2.2.0 # The httpcore version is often different from the httpclient and httpmime versions, # so the httpcore version value should not share the same symbolic name with them. -/org.apache.httpcomponents/httpclient = 4.2.6 -/org.apache.httpcomponents/httpcore = 4.2.5 -/org.apache.httpcomponents/httpmime = 4.2.6 +/org.apache.httpcomponents/httpclient = 4.3.1 +/org.apache.httpcomponents/httpcore = 4.3 +/org.apache.httpcomponents/httpmime = 4.3.1 org.apache.james.apache.mime4j.version = 0.7.2 /org.apache.james/apache-mime4j-core = ${org.apache.james.apache.mime4j.version} diff --git a/lucene/licenses/httpclient-4.2.6.jar.sha1 b/lucene/licenses/httpclient-4.2.6.jar.sha1 deleted file mode 100644 index 595aa27658b..00000000000 --- a/lucene/licenses/httpclient-4.2.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e4ca30a6a3a075053a61c6fc850d2432dc012ba7 diff --git a/lucene/licenses/httpclient-4.3.1.jar.sha1 b/lucene/licenses/httpclient-4.3.1.jar.sha1 new file mode 100644 index 00000000000..0e6a5bb76f7 --- /dev/null +++ b/lucene/licenses/httpclient-4.3.1.jar.sha1 @@ -0,0 +1 @@ +0ec13f6423eb6d5858e229939a2bc118473ef94c diff --git a/lucene/licenses/httpcore-4.2.5.jar.sha1 b/lucene/licenses/httpcore-4.2.5.jar.sha1 deleted file mode 100644 index 84d99e9ed76..00000000000 --- a/lucene/licenses/httpcore-4.2.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -472f0f5f8dba5d1962cb9d7739feed739a31c30d diff --git a/lucene/licenses/httpcore-4.3.jar.sha1 b/lucene/licenses/httpcore-4.3.jar.sha1 new file mode 100644 index 00000000000..07ffe5f8cb3 --- /dev/null +++ b/lucene/licenses/httpcore-4.3.jar.sha1 @@ -0,0 +1 @@ +11393498b38e9695d0850cac26fde5613ae268b9 diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 38a924f4d4e..25d071fda92 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -258,6 +258,9 @@ Other Changes * SOLR-5574: CoreContainer shutdown publishes all nodes as down and waits to see that and then again publishes all nodes as down. (Mark Miller) +* SOLR-5590: Upgrade HttpClient/HttpComponents to 4.3.x. + (Karl Wright via Shawn Heisey) + ================== 4.6.1 ================== Versions of Major Components diff --git a/solr/licenses/httpclient-4.2.6.jar.sha1 b/solr/licenses/httpclient-4.2.6.jar.sha1 deleted file mode 100644 index 595aa27658b..00000000000 --- a/solr/licenses/httpclient-4.2.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e4ca30a6a3a075053a61c6fc850d2432dc012ba7 diff --git a/solr/licenses/httpclient-4.3.1.jar.sha1 b/solr/licenses/httpclient-4.3.1.jar.sha1 new file mode 100644 index 00000000000..0e6a5bb76f7 --- /dev/null +++ b/solr/licenses/httpclient-4.3.1.jar.sha1 @@ -0,0 +1 @@ +0ec13f6423eb6d5858e229939a2bc118473ef94c diff --git a/solr/licenses/httpcore-4.2.5.jar.sha1 b/solr/licenses/httpcore-4.2.5.jar.sha1 deleted file mode 100644 index 84d99e9ed76..00000000000 --- a/solr/licenses/httpcore-4.2.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -472f0f5f8dba5d1962cb9d7739feed739a31c30d diff --git a/solr/licenses/httpcore-4.3.jar.sha1 b/solr/licenses/httpcore-4.3.jar.sha1 new file mode 100644 index 00000000000..07ffe5f8cb3 --- /dev/null +++ b/solr/licenses/httpcore-4.3.jar.sha1 @@ -0,0 +1 @@ +11393498b38e9695d0850cac26fde5613ae268b9 diff --git a/solr/licenses/httpmime-4.2.6.jar.sha1 b/solr/licenses/httpmime-4.2.6.jar.sha1 deleted file mode 100644 index 8ffaf54edf9..00000000000 --- a/solr/licenses/httpmime-4.2.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -270386011895bc6c7ee6496fd87511d6a98093c1 diff --git a/solr/licenses/httpmime-4.3.1.jar.sha1 b/solr/licenses/httpmime-4.3.1.jar.sha1 new file mode 100644 index 00000000000..fb256890c78 --- /dev/null +++ b/solr/licenses/httpmime-4.3.1.jar.sha1 @@ -0,0 +1 @@ +f7899276dddd01d8a42ecfe27e7031fcf9824422