diff --git a/changelog/unreleased/PR#4027-update-org-apache-hadoop-thirdparty-hadoop-shaded.yml b/changelog/unreleased/PR#4027-update-org-apache-hadoop-thirdparty-hadoop-shaded.yml new file mode 100644 index 000000000000..6f42dc7487f6 --- /dev/null +++ b/changelog/unreleased/PR#4027-update-org-apache-hadoop-thirdparty-hadoop-shaded.yml @@ -0,0 +1,7 @@ +title: Update org.apache.hadoop.thirdparty:hadoop-shaded-guava to v1.5.0 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#4027 + url: https://github.com/apache/solr/pull/4027 diff --git a/solr/licenses/hadoop-shaded-guava-1.4.0.jar.sha1 b/solr/licenses/hadoop-shaded-guava-1.4.0.jar.sha1 deleted file mode 100644 index 8843631c09cc..000000000000 --- a/solr/licenses/hadoop-shaded-guava-1.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f1c2f282d00a9e20d29334762fd7db3da939fd87 diff --git a/solr/licenses/hadoop-shaded-guava-1.5.0.jar.sha1 b/solr/licenses/hadoop-shaded-guava-1.5.0.jar.sha1 new file mode 100644 index 000000000000..e68eac7ec303 --- /dev/null +++ b/solr/licenses/hadoop-shaded-guava-1.5.0.jar.sha1 @@ -0,0 +1 @@ +f2ca5a1a9151cb9e14ea069770eba750b38ddb70 diff --git a/versions.lock b/versions.lock index b99b5dd0c59d..cd4a10128322 100644 --- a/versions.lock +++ b/versions.lock @@ -190,7 +190,7 @@ org.apache.hadoop:hadoop-auth:3.4.1 (1 constraints: 0a050736) org.apache.hadoop:hadoop-client-api:3.4.1 (3 constraints: 1928b25e) org.apache.hadoop:hadoop-client-runtime:3.4.1 (2 constraints: 67170843) org.apache.hadoop:hadoop-common:3.4.1 (1 constraints: 0a050736) -org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.4.0 (1 constraints: 0705fc35) +org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.5.0 (1 constraints: 0805ff35) org.apache.httpcomponents:httpclient:4.5.14 (7 constraints: b7695b2f) org.apache.httpcomponents:httpcore:4.4.16 (6 constraints: ea5cc678) org.apache.httpcomponents:httpmime:4.5.14 (1 constraints: 40054f3b) diff --git a/versions.props b/versions.props index b95645350ce2..0e807a36b640 100644 --- a/versions.props +++ b/versions.props @@ -49,7 +49,7 @@ org.apache.commons:commons-exec=1.5.0 org.apache.commons:commons-lang3=3.19.0 org.apache.commons:commons-math3=3.6.1 org.apache.curator:*=5.9.0 -org.apache.hadoop.thirdparty:*=1.4.0 +org.apache.hadoop.thirdparty:*=1.5.0 org.apache.hadoop:*=3.4.1 org.apache.httpcomponents:httpclient=4.5.14 org.apache.httpcomponents:httpcore=4.4.16