Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Update dependency org.apache.hadoop.thirdparty:hadoop-shaded-guava to v1.2.0 (#2269)

Solr Botd50fbf3d16b1
diff --git a/solr/licenses/hadoop-shaded-guava-1.1.1.jar.sha1 b/solr/licenses/hadoop-shaded-guava-1.1.1.jar.sha1
deleted file mode 100644
index 36924b7d2fd..00000000000
--- a/solr/licenses/hadoop-shaded-guava-1.1.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-02419d851c01139edf9e19b81056382163d9bfab
diff --git a/solr/licenses/hadoop-shaded-guava-1.2.0.jar.sha1 b/solr/licenses/hadoop-shaded-guava-1.2.0.jar.sha1
new file mode 100644
index 00000000000..2e3ae98fd2c
--- /dev/null
+++ b/solr/licenses/hadoop-shaded-guava-1.2.0.jar.sha1
@@ -0,0 +1 @@
+a0a6e7aa87c838ea418fc36ed290987dd90f5f6c
diff --git a/versions.lock b/versions.lock
index e42778e7620..8957ce649e0 100644
--- a/versions.lock
+++ b/versions.lock
@@ -188,7 +188,7 @@ org.apache.hadoop:hadoop-auth:3.3.6 (1 constraints: 0e050936)
org.apache.hadoop:hadoop-client-api:3.3.6 (3 constraints: 25280861)
org.apache.hadoop:hadoop-client-runtime:3.3.6 (2 constraints: 6f17dc43)
org.apache.hadoop:hadoop-common:3.3.6 (1 constraints: 0e050936)
-org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 (1 constraints: 0505f435)
+org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.2.0 (1 constraints: 0505f635)
org.apache.httpcomponents:httpclient:4.5.14 (9 constraints: 62806342)
org.apache.httpcomponents:httpcore:4.4.16 (8 constraints: 256d4617)
org.apache.httpcomponents:httpmime:4.5.14 (3 constraints: eb1bfedc)
diff --git a/versions.props b/versions.props
index 85f7a1627e7..eabf508d043 100644
--- a/versions.props
+++ b/versions.props
@@ -41,7 +41,7 @@ org.apache.commons:commons-exec=1.4.0
org.apache.commons:commons-lang3=3.14.0
org.apache.commons:commons-math3=3.6.1
org.apache.curator:*=5.7.0
-org.apache.hadoop.thirdparty:*=1.1.1
+org.apache.hadoop.thirdparty:*=1.2.0
org.apache.hadoop:*=3.3.6
org.apache.httpcomponents:httpclient=4.5.14
org.apache.httpcomponents:httpcore=4.4.16