You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by md...@apache.org on 2021/10/11 23:26:55 UTC
[lucene-solr] branch branch_8x updated: SOLR-15269: Upgrade
httpclient and httpmime to 4.5.13 (#2579)
This is an automated email from the ASF dual-hosted git repository.
mdrob pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 11ff3fe SOLR-15269: Upgrade httpclient and httpmime to 4.5.13 (#2579)
11ff3fe is described below
commit 11ff3fe9034a6dfe83b00ff29c57b02b6c443483
Author: ventry1990 <ve...@gmail.com>
AuthorDate: Tue Oct 12 07:26:44 2021 +0800
SOLR-15269: Upgrade httpclient and httpmime to 4.5.13 (#2579)
---
lucene/ivy-versions.properties | 4 ++--
lucene/licenses/httpclient-4.5.12.jar.sha1 | 1 -
lucene/licenses/httpclient-4.5.13.jar.sha1 | 1 +
solr/CHANGES.txt | 3 +++
solr/licenses/httpclient-4.5.12.jar.sha1 | 1 -
solr/licenses/httpclient-4.5.13.jar.sha1 | 1 +
solr/licenses/httpmime-4.5.12.jar.sha1 | 1 -
solr/licenses/httpmime-4.5.13.jar.sha1 | 1 +
8 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 763ee54..92d7f8a 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -207,9 +207,9 @@ org.apache.hadoop.version = 3.2.2
# 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.5.12
+/org.apache.httpcomponents/httpclient = 4.5.13
/org.apache.httpcomponents/httpcore = 4.4.14
-/org.apache.httpcomponents/httpmime = 4.5.12
+/org.apache.httpcomponents/httpmime = 4.5.13
/org.apache.ivy/ivy = 2.4.0
diff --git a/lucene/licenses/httpclient-4.5.12.jar.sha1 b/lucene/licenses/httpclient-4.5.12.jar.sha1
deleted file mode 100644
index 9c5b2f9..0000000
--- a/lucene/licenses/httpclient-4.5.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4023a2a80b64c25926911faf350b50cd2a29220f
diff --git a/lucene/licenses/httpclient-4.5.13.jar.sha1 b/lucene/licenses/httpclient-4.5.13.jar.sha1
new file mode 100644
index 0000000..ece7cde
--- /dev/null
+++ b/lucene/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 52b6ef4..631bf2c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -32,6 +32,7 @@ Build
Other Changes
---------------------
+
* SOLR-15678: Allow only known content types in ShowFileRequestHandler (janhoy, Gus Heck, Mal Aware)
======================= 8.10.1 =======================
@@ -47,6 +48,8 @@ Other Changes
- errorprone: 2.9.0
- gcp-client: 1.32.1
(Houston Putman)
+
+* SOLR-15269: Upgrade httpclient and httpmime to 4.5.13. (ventry)
================== 8.10.0 ==================
diff --git a/solr/licenses/httpclient-4.5.12.jar.sha1 b/solr/licenses/httpclient-4.5.12.jar.sha1
deleted file mode 100644
index 9c5b2f9..0000000
--- a/solr/licenses/httpclient-4.5.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4023a2a80b64c25926911faf350b50cd2a29220f
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 0000000..ece7cde
--- /dev/null
+++ b/solr/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/solr/licenses/httpmime-4.5.12.jar.sha1 b/solr/licenses/httpmime-4.5.12.jar.sha1
deleted file mode 100644
index 224e0bd..0000000
--- a/solr/licenses/httpmime-4.5.12.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dbc2fd394152477bb1d1774bdcdde195e8c3a4ff
diff --git a/solr/licenses/httpmime-4.5.13.jar.sha1 b/solr/licenses/httpmime-4.5.13.jar.sha1
new file mode 100644
index 0000000..877dded
--- /dev/null
+++ b/solr/licenses/httpmime-4.5.13.jar.sha1
@@ -0,0 +1 @@
+efc110bad4a0d45cda7858e6beee1d8a8313da5a