Apache Solr open-source search software
SOLR-16423: Upgrade to Hadoop 3.3.4 (#1033)
Kevin Risden21424dc74ff9
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 668d9431ee7..cb510403bc8 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -214,6 +214,8 @@ Other Changes* SOLR-16422: Upgrade Apache Zookeeper to 3.8.0 (Kevin Risden)+* SOLR-16423: Upgrade Apache Hadoop to 3.3.4 (Kevin Risden)+Build---------------------* SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via Alessandro Benedetti)diff --git a/solr/licenses/hadoop-annotations-3.3.3.jar.sha1 b/solr/licenses/hadoop-annotations-3.3.3.jar.sha1deleted file mode 100644index b5e4d34342b..00000000000--- a/solr/licenses/hadoop-annotations-3.3.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f093f02eb980be6afcda2c86aff71bcf8d9c5d9cdiff --git a/solr/licenses/hadoop-annotations-3.3.4.jar.sha1 b/solr/licenses/hadoop-annotations-3.3.4.jar.sha1new file mode 100644index 00000000000..0242e2ec404--- /dev/null+++ b/solr/licenses/hadoop-annotations-3.3.4.jar.sha1@@ -0,0 +1 @@+fad1f131ac30d56061bc1aab3dc3c7ea4b89b50ediff --git a/solr/licenses/hadoop-auth-3.3.3.jar.sha1 b/solr/licenses/hadoop-auth-3.3.3.jar.sha1deleted file mode 100644index 4c2d0542654..00000000000--- a/solr/licenses/hadoop-auth-3.3.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-6788fe94013801dca0712e3fd19b3c140f03b6e0diff --git a/solr/licenses/hadoop-auth-3.3.4.jar.sha1 b/solr/licenses/hadoop-auth-3.3.4.jar.sha1new file mode 100644index 00000000000..7c32917040e--- /dev/null+++ b/solr/licenses/hadoop-auth-3.3.4.jar.sha1@@ -0,0 +1 @@+c5e22136356e17daac21873c730ea1435f761e9ddiff --git a/solr/licenses/hadoop-client-api-3.3.3.jar.sha1 b/solr/licenses/hadoop-client-api-3.3.3.jar.sha1deleted file mode 100644index cd914d8cd2d..00000000000--- a/solr/licenses/hadoop-client-api-3.3.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d0593aed2d4df9bcee507550913d29d589ebd84adiff --git a/solr/licenses/hadoop-client-api-3.3.4.jar.sha1 b/solr/licenses/hadoop-client-api-3.3.4.jar.sha1new file mode 100644index 00000000000..ec0d4cf0e76--- /dev/null+++ b/solr/licenses/hadoop-client-api-3.3.4.jar.sha1@@ -0,0 +1 @@+6339a8f7279310c8b1f7ef314b592d8c71ca72efdiff --git a/solr/licenses/hadoop-client-minicluster-3.3.3.jar.sha1 b/solr/licenses/hadoop-client-minicluster-3.3.3.jar.sha1deleted file mode 100644index d0b9ae91b1b..00000000000--- a/solr/licenses/hadoop-client-minicluster-3.3.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-5820fe54634c163e08c8040747fb089f31acb90ddiff --git a/solr/licenses/hadoop-client-minicluster-3.3.4.jar.sha1 b/solr/licenses/hadoop-client-minicluster-3.3.4.jar.sha1new file mode 100644index 00000000000..6a206215670--- /dev/null+++ b/solr/licenses/hadoop-client-minicluster-3.3.4.jar.sha1@@ -0,0 +1 @@+85a4188e940bfe5e2661363f998fe1f37ec07831diff --git a/solr/licenses/hadoop-client-runtime-3.3.3.jar.sha1 b/solr/licenses/hadoop-client-runtime-3.3.3.jar.sha1deleted file mode 100644index 1821815ab2a..00000000000--- a/solr/licenses/hadoop-client-runtime-3.3.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-52619ecfb0225d7ae67b15264521064824ac57cadiff --git a/solr/licenses/hadoop-client-runtime-3.3.4.jar.sha1 b/solr/licenses/hadoop-client-runtime-3.3.4.jar.sha1new file mode 100644index 00000000000..38590c10014--- /dev/null+++ b/solr/licenses/hadoop-client-runtime-3.3.4.jar.sha1@@ -0,0 +1 @@+21f7a9a2da446f1e5b3e5af16ebf956d3ee43ee0diff --git a/solr/licenses/hadoop-common-3.3.3.jar.sha1 b/solr/licenses/hadoop-common-3.3.3.jar.sha1deleted file mode 100644index 46804c863ce..00000000000--- a/solr/licenses/hadoop-common-3.3.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-2e1293fddedc9d5c42ce07703d22c33eb3b39aa3diff --git a/solr/licenses/hadoop-common-3.3.4.jar.sha1 b/solr/licenses/hadoop-common-3.3.4.jar.sha1new file mode 100644index 00000000000..fd3a42c98a7--- /dev/null+++ b/solr/licenses/hadoop-common-3.3.4.jar.sha1@@ -0,0 +1 @@+07bf7af4349da68e1afd1310c61de04eec0a001cdiff --git a/solr/licenses/hadoop-hdfs-3.3.3-tests.jar.sha1 b/solr/licenses/hadoop-hdfs-3.3.3-tests.jar.sha1deleted file mode 100644index f8fe3f45396..00000000000--- a/solr/licenses/hadoop-hdfs-3.3.3-tests.jar.sha1+++ /dev/null@@ -1 +0,0 @@-1bbe7acb60ffd432cc4bce646673279d0febdbc2diff --git a/solr/licenses/hadoop-hdfs-3.3.3.jar.sha1 b/solr/licenses/hadoop-hdfs-3.3.3.jar.sha1deleted file mode 100644index 5bc3a315c32..00000000000--- a/solr/licenses/hadoop-hdfs-3.3.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-d4d199760c11d47f90e12fe3882e2b24c77e4eb5diff --git a/solr/licenses/hadoop-hdfs-3.3.4-tests.jar.sha1 b/solr/licenses/hadoop-hdfs-3.3.4-tests.jar.sha1new file mode 100644index 00000000000..34dbd0d235c--- /dev/null+++ b/solr/licenses/hadoop-hdfs-3.3.4-tests.jar.sha1@@ -0,0 +1 @@+79b18090a33b881c3d1ad051c0b1e049b9f7358bdiff --git a/solr/licenses/hadoop-hdfs-3.3.4.jar.sha1 b/solr/licenses/hadoop-hdfs-3.3.4.jar.sha1new file mode 100644index 00000000000..cf7a7a64150--- /dev/null+++ b/solr/licenses/hadoop-hdfs-3.3.4.jar.sha1@@ -0,0 +1 @@+036ef2f86dc44410d2bb5d54ce40435d2484d9a5diff --git a/solr/licenses/hadoop-minikdc-3.3.3.jar.sha1 b/solr/licenses/hadoop-minikdc-3.3.3.jar.sha1deleted file mode 100644index ff534b2c382..00000000000--- a/solr/licenses/hadoop-minikdc-3.3.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-1871c97108af3689f82c619cfd92f01b38e4f47cdiff --git a/solr/licenses/hadoop-minikdc-3.3.4.jar.sha1 b/solr/licenses/hadoop-minikdc-3.3.4.jar.sha1new file mode 100644index 00000000000..e1da9d0def6--- /dev/null+++ b/solr/licenses/hadoop-minikdc-3.3.4.jar.sha1@@ -0,0 +1 @@+3c03b4c9a11a252a32f41dfa490483f762c5d2addiff --git a/versions.lock b/versions.lockindex b15f18f17aa..9ee864c37c6 100644--- a/versions.lock+++ b/versions.lock@@ -136,11 +136,11 @@ org.apache.commons:commons-text:1.9 (2 constraints: 00165ad0)org.apache.curator:curator-client:4.3.0 (2 constraints: e214cba2)org.apache.curator:curator-framework:4.3.0 (2 constraints: ff13b474)org.apache.curator:curator-recipes:4.3.0 (1 constraints: 09050836)-org.apache.hadoop:hadoop-annotations:3.3.3 (1 constraints: 0b050636)-org.apache.hadoop:hadoop-auth:3.3.3 (1 constraints: 0b050636)-org.apache.hadoop:hadoop-client-api:3.3.3 (3 constraints: 1c28435f)-org.apache.hadoop:hadoop-client-runtime:3.3.3 (2 constraints: 69173a43)-org.apache.hadoop:hadoop-common:3.3.3 (1 constraints: 0b050636)+org.apache.hadoop:hadoop-annotations:3.3.4 (1 constraints: 0c050736)+org.apache.hadoop:hadoop-auth:3.3.4 (1 constraints: 0c050736)+org.apache.hadoop:hadoop-client-api:3.3.4 (3 constraints: 1f28da5f)+org.apache.hadoop:hadoop-client-runtime:3.3.4 (2 constraints: 6b177043)+org.apache.hadoop:hadoop-common:3.3.4 (1 constraints: 0c050736)org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1 (1 constraints: 0505f435)org.apache.httpcomponents:httpclient:4.5.13 (9 constraints: 5d801b3e)org.apache.httpcomponents:httpcore:4.4.15 (8 constraints: 1c6d2913)@@ -358,9 +358,9 @@ net.bytebuddy:byte-buddy:1.10.20 (2 constraints: 7c10a9d0)net.minidev:accessors-smart:2.4.7 (1 constraints: 4e0a90b8)net.minidev:json-smart:2.4.7 (1 constraints: 160e936e)no.nav.security:mock-oauth2-server:0.4.3 (1 constraints: 0905fa35)-org.apache.hadoop:hadoop-client-minicluster:3.3.3 (1 constraints: 0b050636)-org.apache.hadoop:hadoop-hdfs:3.3.3 (1 constraints: 0b050636)-org.apache.hadoop:hadoop-minikdc:3.3.3 (1 constraints: 0b050636)+org.apache.hadoop:hadoop-client-minicluster:3.3.4 (1 constraints: 0c050736)+org.apache.hadoop:hadoop-hdfs:3.3.4 (1 constraints: 0c050736)+org.apache.hadoop:hadoop-minikdc:3.3.4 (1 constraints: 0c050736)org.apache.kerby:kerb-admin:1.0.1 (1 constraints: 840d892f)org.apache.kerby:kerb-client:1.0.1 (1 constraints: 840d892f)org.apache.kerby:kerb-common:1.0.1 (2 constraints: a51841ca)diff --git a/versions.props b/versions.propsindex 999ca36f08a..5389c6cbdfd 100644--- a/versions.props+++ b/versions.props@@ -43,7 +43,7 @@ org.apache.commons:commons-math3=3.6.1org.apache.commons:commons-text=1.9org.apache.curator:*=4.3.0org.apache.hadoop.thirdparty:*=1.1.1-org.apache.hadoop:*=3.3.3+org.apache.hadoop:*=3.3.4org.apache.httpcomponents:httpclient=4.5.13org.apache.httpcomponents:httpcore=4.4.15org.apache.httpcomponents:httpmime=4.5.13