Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15002 Upgrade httpclient to 4.5.13 and httpcore to 4.4.13 (#27)

András Salamon27c66a3e1e57
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index fbc6f575854..2576b7ec0ee 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -236,6 +236,8 @@ Other Changes
* SOLR-14928: Allow cluster state updates to be done in a distributed fashion without going through Overseer (Ilan Ginzburg)
+* SOLR-15002: Upgrade httpclient to 4.5.13 and httpcore to 4.4.13 (Andras Salamon via janhoy)
+
* SOLR-15121: Move XSLT (tr param) response writer and update request handler to scripting contrib. (Eric Pugh, David Smiley)
* SOLR-15292: SignatureUpdateProcessorFactory will fail to initialize if it is used in a SolrCloud cluster in a way that is
diff --git a/solr/licenses/httpclient-4.5.10.jar.sha1 b/solr/licenses/httpclient-4.5.10.jar.sha1
deleted file mode 100644
index f50700699c1..00000000000
--- a/solr/licenses/httpclient-4.5.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5
diff --git a/solr/licenses/httpclient-4.5.13.jar.sha1 b/solr/licenses/httpclient-4.5.13.jar.sha1
new file mode 100644
index 00000000000..ece7cdea6ea
--- /dev/null
+++ b/solr/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/solr/licenses/httpcore-4.4.12.jar.sha1 b/solr/licenses/httpcore-4.4.12.jar.sha1
deleted file mode 100644
index 2a062f3c442..00000000000
--- a/solr/licenses/httpcore-4.4.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-21ebaf6d532bc350ba95bd81938fa5f0e511c132
diff --git a/solr/licenses/httpcore-4.4.13.jar.sha1 b/solr/licenses/httpcore-4.4.13.jar.sha1
new file mode 100644
index 00000000000..cffee0313f5
--- /dev/null
+++ b/solr/licenses/httpcore-4.4.13.jar.sha1
@@ -0,0 +1 @@
+853b96d3afbb7bf8cc303fe27ee96836a10c1834
diff --git a/versions.lock b/versions.lock
index c2b8df0ea80..0369039defd 100644
--- a/versions.lock
+++ b/versions.lock
@@ -87,8 +87,8 @@ org.apache.hadoop:hadoop-auth:3.2.0 (1 constraints: 07050036)
org.apache.hadoop:hadoop-common:3.2.0 (1 constraints: 07050036)
org.apache.hadoop:hadoop-hdfs-client:3.2.0 (1 constraints: 07050036)
org.apache.htrace:htrace-core4:4.1.0-incubating (1 constraints: 58090086)
-org.apache.httpcomponents:httpclient:4.5.10 (2 constraints: bb14be9e)
-org.apache.httpcomponents:httpcore:4.4.12 (2 constraints: 941535ce)
+org.apache.httpcomponents:httpclient:4.5.13 (2 constraints: be14459f)
+org.apache.httpcomponents:httpcore:4.4.13 (2 constraints: 961565ce)
org.apache.httpcomponents:httpmime:4.5.10 (1 constraints: 3c054b3b)
org.apache.james:apache-mime4j-core:0.8.3 (1 constraints: 0d050636)
org.apache.james:apache-mime4j-dom:0.8.3 (1 constraints: 0d050636)
diff --git a/versions.props b/versions.props
index ec9d02d754a..07ef2b0451f 100644
--- a/versions.props
+++ b/versions.props
@@ -57,8 +57,8 @@ org.apache.commons:commons-text=1.6
org.apache.curator:*=2.13.0
org.apache.hadoop:*=3.2.0
org.apache.htrace:htrace-core4=4.1.0-incubating
-org.apache.httpcomponents:httpclient=4.5.10
-org.apache.httpcomponents:httpcore=4.4.12
+org.apache.httpcomponents:httpclient=4.5.13
+org.apache.httpcomponents:httpcore=4.4.13
org.apache.httpcomponents:httpmime=4.5.10
org.apache.james:apache-mime4j*=0.8.3
org.apache.kerby:*=1.0.1