From 61f662355016c56760374e8c49bd86caf04c8d79 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 25 Oct 2024 10:00:06 -0400 Subject: [PATCH] Upgrade hadoop dependencies to 3.4.1 Signed-off-by: Craig Perkins --- .github/dependabot_server.yml | 8 ++++++++ plugins/repository-hdfs/build.gradle | 2 +- .../licenses/hadoop-client-api-3.3.6.jar.sha1 | 1 - .../licenses/hadoop-client-api-3.4.1.jar.sha1 | 1 + .../licenses/hadoop-client-runtime-3.3.6.jar.sha1 | 1 - .../licenses/hadoop-client-runtime-3.4.1.jar.sha1 | 1 + .../repository-hdfs/licenses/hadoop-hdfs-3.3.6.jar.sha1 | 1 - .../repository-hdfs/licenses/hadoop-hdfs-3.4.1.jar.sha1 | 1 + test/fixtures/hdfs-fixture/build.gradle | 2 +- 9 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 .github/dependabot_server.yml delete mode 100644 plugins/repository-hdfs/licenses/hadoop-client-api-3.3.6.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/hadoop-client-api-3.4.1.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/hadoop-client-runtime-3.3.6.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/hadoop-client-runtime-3.4.1.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/hadoop-hdfs-3.3.6.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/hadoop-hdfs-3.4.1.jar.sha1 diff --git a/.github/dependabot_server.yml b/.github/dependabot_server.yml new file mode 100644 index 0000000000000..35cb00da78cd8 --- /dev/null +++ b/.github/dependabot_server.yml @@ -0,0 +1,8 @@ +job: + package-manager: gradle + allowed-updates: + - update-type: all + source: + provider: github + repo: cwperks/opensearch + directory: / diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index faa9b2bfff84d..98f410b83dd3b 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -48,7 +48,7 @@ opensearchplugin { } versions << [ - 'hadoop3': '3.3.6' + 'hadoop3': '3.4.1' ] testFixtures.useFixture ":test:fixtures:krb5kdc-fixture", "hdfs" diff --git a/plugins/repository-hdfs/licenses/hadoop-client-api-3.3.6.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-client-api-3.3.6.jar.sha1 deleted file mode 100644 index d99793bc56522..0000000000000 --- a/plugins/repository-hdfs/licenses/hadoop-client-api-3.3.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12ac6f103a0ff29fce17a078c7c64d25320b6165 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/hadoop-client-api-3.4.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-client-api-3.4.1.jar.sha1 new file mode 100644 index 0000000000000..b02c77d734c95 --- /dev/null +++ b/plugins/repository-hdfs/licenses/hadoop-client-api-3.4.1.jar.sha1 @@ -0,0 +1 @@ +7e4cfae7f5c85cffdbc21fdf749262fc78d4463a \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/hadoop-client-runtime-3.3.6.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-client-runtime-3.3.6.jar.sha1 deleted file mode 100644 index ea22d763b7bfa..0000000000000 --- a/plugins/repository-hdfs/licenses/hadoop-client-runtime-3.3.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -81065531e63fccbe85fb04a3274709593fb00d3c \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/hadoop-client-runtime-3.4.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-client-runtime-3.4.1.jar.sha1 new file mode 100644 index 0000000000000..c1f1cb1666a85 --- /dev/null +++ b/plugins/repository-hdfs/licenses/hadoop-client-runtime-3.4.1.jar.sha1 @@ -0,0 +1 @@ +30ec07ceccb224b2ef17af34fbb593bff3e9e071 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/hadoop-hdfs-3.3.6.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-hdfs-3.3.6.jar.sha1 deleted file mode 100644 index fe60968056eb7..0000000000000 --- a/plugins/repository-hdfs/licenses/hadoop-hdfs-3.3.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ba40aca60f39599d5b1f1d32b35295bfde1f3c8b \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/hadoop-hdfs-3.4.1.jar.sha1 b/plugins/repository-hdfs/licenses/hadoop-hdfs-3.4.1.jar.sha1 new file mode 100644 index 0000000000000..820763ebd73af --- /dev/null +++ b/plugins/repository-hdfs/licenses/hadoop-hdfs-3.4.1.jar.sha1 @@ -0,0 +1 @@ +8545078b39e33416cb70ccef1bb22f2c88fb6b6c \ No newline at end of file diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index 9e6b540065005..2cd0d442bdcd3 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -37,7 +37,7 @@ versions << [ ] dependencies { - api("org.apache.hadoop:hadoop-minicluster:3.4.0") { + api("org.apache.hadoop:hadoop-minicluster:3.4.1") { exclude module: 'websocket-client' exclude module: 'jettison' exclude module: 'netty'