Skip to content

Commit 4174c89

Browse files
authored
bump hadoop hdfs to 3.4.1 (#117263) (#117395)
This commit bump hadoop hdfs to 3.4.1 (for repository-hdfs) .
1 parent ea05686 commit 4174c89

File tree

3 files changed

+30
-22
lines changed

3 files changed

+30
-22
lines changed

gradle/verification-metadata.xml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,6 +1171,11 @@
11711171
<sha256 value="e7cd8951956d349b568b7ccfd4f5b2529a8c113e67c32b028f52ffda371259d9" origin="Generated by Gradle"/>
11721172
</artifact>
11731173
</component>
1174+
<component group="commons-cli" name="commons-cli" version="1.5.0">
1175+
<artifact name="commons-cli-1.5.0.jar">
1176+
<sha256 value="bc8bb01fc0fad250385706e20f927ddcff6173f6339b387dc879237752567ac6" origin="Generated by Gradle"/>
1177+
</artifact>
1178+
</component>
11741179
<component group="commons-codec" name="commons-codec" version="1.11">
11751180
<artifact name="commons-codec-1.11.jar">
11761181
<sha256 value="e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d" origin="Generated by Gradle"/>
@@ -1221,16 +1226,16 @@
12211226
<sha256 value="05662373044f3dff112567b7bb5dfa1174e91e074c0c727b4412788013f49d56" origin="Generated by Gradle"/>
12221227
</artifact>
12231228
</component>
1224-
<component group="commons-io" name="commons-io" version="2.11.0">
1225-
<artifact name="commons-io-2.11.0.jar">
1226-
<sha256 value="961b2f6d87dbacc5d54abf45ab7a6e2495f89b75598962d8c723cea9bc210908" origin="Generated by Gradle"/>
1227-
</artifact>
1228-
</component>
12291229
<component group="commons-io" name="commons-io" version="2.15.1">
12301230
<artifact name="commons-io-2.15.1.jar">
12311231
<sha256 value="a58af12ee1b68cfd2ebb0c27caef164f084381a00ec81a48cc275fd7ea54e154" origin="Generated by Gradle"/>
12321232
</artifact>
12331233
</component>
1234+
<component group="commons-io" name="commons-io" version="2.16.1">
1235+
<artifact name="commons-io-2.16.1.jar">
1236+
<sha256 value="f41f7baacd716896447ace9758621f62c1c6b0a91d89acee488da26fc477c84f" origin="Generated by Gradle"/>
1237+
</artifact>
1238+
</component>
12341239
<component group="commons-io" name="commons-io" version="2.17.0">
12351240
<artifact name="commons-io-2.17.0.jar">
12361241
<sha256 value="4aa4ca48f3dfd30b78220b7881d8cb93eac4093ec94361b6befa9487998a550b" origin="Generated by Gradle"/>
@@ -2327,14 +2332,14 @@
23272332
<sha256 value="a29e54e5c9d03f52ea28a544342140f73870a5bca9a9789988a66c199b01dd8a" origin="Generated by Gradle"/>
23282333
</artifact>
23292334
</component>
2330-
<component group="org.apache.hadoop" name="hadoop-client-api" version="3.3.3">
2331-
<artifact name="hadoop-client-api-3.3.3.jar">
2332-
<sha256 value="447292218fb52aac173efeea549bdc7e2392c6445d33ae28c38a4d9b90d1d31a" origin="Generated by Gradle"/>
2335+
<component group="org.apache.hadoop" name="hadoop-client-api" version="3.4.1">
2336+
<artifact name="hadoop-client-api-3.4.1.jar">
2337+
<sha256 value="a964d4daa054c9615bbafb4553efbb140fa7fb9ac6f358a24393f183a5703438" origin="Generated by Gradle"/>
23332338
</artifact>
23342339
</component>
2335-
<component group="org.apache.hadoop" name="hadoop-client-runtime" version="3.3.3">
2336-
<artifact name="hadoop-client-runtime-3.3.3.jar">
2337-
<sha256 value="e2151873292cb48da649e4a51ce43009faf3528af1778aa64919f7514541ca27" origin="Generated by Gradle"/>
2340+
<component group="org.apache.hadoop" name="hadoop-client-runtime" version="3.4.1">
2341+
<artifact name="hadoop-client-runtime-3.4.1.jar">
2342+
<sha256 value="f6a800a159f918670db533606d33560d6c13b7e13f14eda493280ae33b9eeb2f" origin="Generated by Gradle"/>
23382343
</artifact>
23392344
</component>
23402345
<component group="org.apache.hadoop" name="hadoop-common" version="2.8.5">
@@ -2369,9 +2374,9 @@
23692374
<sha256 value="581e11802400f77010937e1aa2b5ed48b2dca26db054fb9493ffe799e562cd57" origin="Generated by Gradle"/>
23702375
</artifact>
23712376
</component>
2372-
<component group="org.apache.hadoop" name="hadoop-hdfs" version="3.3.3">
2373-
<artifact name="hadoop-hdfs-3.3.3.jar">
2374-
<sha256 value="544a835362ea112476f05d21d6a16b0f20cdcf3467f170cef762cffdac9166c7" origin="Generated by Gradle"/>
2377+
<component group="org.apache.hadoop" name="hadoop-hdfs" version="3.4.1">
2378+
<artifact name="hadoop-hdfs-3.4.1.jar">
2379+
<sha256 value="91d1bcdb554dcf95d2daa12c7c0ef706c64692c21e9edcf2059d4683bedb0cc6" origin="Generated by Gradle"/>
23752380
</artifact>
23762381
</component>
23772382
<component group="org.apache.hadoop" name="hadoop-hdfs-client" version="2.8.5">

plugins/repository-hdfs/build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ esplugin {
2020
}
2121

2222
versions << [
23-
'hadoop': '3.3.3'
23+
'hadoop': '3.4.1'
2424
]
2525

2626
configurations {
@@ -42,9 +42,9 @@ dependencies {
4242
api "com.google.protobuf:protobuf-java:${versions.protobuf}"
4343
api "commons-logging:commons-logging:${versions.commonslogging}"
4444
api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
45-
api 'commons-cli:commons-cli:1.2'
45+
api 'commons-cli:commons-cli:1.5.0'
4646
api "commons-codec:commons-codec:${versions.commonscodec}"
47-
api 'commons-io:commons-io:2.8.0'
47+
api 'commons-io:commons-io:2.16.1'
4848
api 'org.apache.commons:commons-lang3:3.11'
4949
api 'javax.servlet:javax.servlet-api:3.1.0'
5050
api "org.slf4j:slf4j-api:${versions.slf4j}"
@@ -58,14 +58,14 @@ dependencies {
5858
javaRestTestImplementation project(':test:fixtures:krb5kdc-fixture')
5959
javaRestTestImplementation "org.slf4j:slf4j-api:${versions.slf4j}"
6060
javaRestTestRuntimeOnly "com.google.guava:guava:16.0.1"
61-
javaRestTestRuntimeOnly "commons-cli:commons-cli:1.2"
61+
javaRestTestRuntimeOnly "commons-cli:commons-cli:1.5.0"
6262
javaRestTestRuntimeOnly "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
6363

6464
yamlRestTestCompileOnly(project(':test:fixtures:hdfs-fixture'))
6565
yamlRestTestImplementation project(':test:fixtures:krb5kdc-fixture')
6666
yamlRestTestImplementation "org.slf4j:slf4j-api:${versions.slf4j}"
6767
yamlRestTestRuntimeOnly "com.google.guava:guava:16.0.1"
68-
yamlRestTestRuntimeOnly "commons-cli:commons-cli:1.2"
68+
yamlRestTestRuntimeOnly "commons-cli:commons-cli:1.5.0"
6969
yamlRestTestRuntimeOnly "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
7070

7171
hdfsFixture2 project(path: ':test:fixtures:hdfs-fixture', configuration: 'shadowedHdfs2')
@@ -178,7 +178,6 @@ tasks.named("thirdPartyAudit").configure {
178178
'org.apache.hadoop.thirdparty.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray',
179179
'org.apache.hadoop.thirdparty.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$1',
180180
'org.apache.hadoop.thirdparty.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$2',
181-
'org.apache.hadoop.thirdparty.com.google.common.hash.LittleEndianByteArray$UnsafeByteArray$3',
182181
'org.apache.hadoop.thirdparty.com.google.common.hash.Striped64',
183182
'org.apache.hadoop.thirdparty.com.google.common.hash.Striped64$1',
184183
'org.apache.hadoop.thirdparty.com.google.common.hash.Striped64$Cell',
@@ -189,6 +188,9 @@ tasks.named("thirdPartyAudit").configure {
189188
'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil',
190189
'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$1',
191190
'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$JvmMemoryAccessor',
192-
'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$MemoryAccessor'
191+
'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$MemoryAccessor',
192+
'org.apache.hadoop.thirdparty.protobuf.MessageSchema',
193+
'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$Android32MemoryAccessor',
194+
'org.apache.hadoop.thirdparty.protobuf.UnsafeUtil$Android64MemoryAccessor'
193195
)
194196
}

plugins/repository-hdfs/src/main/java/org/elasticsearch/repositories/hdfs/HdfsSecurityContext.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ class HdfsSecurityContext {
4747
// 2) allow hadoop to add credentials to our Subject
4848
new AuthPermission("modifyPrivateCredentials"),
4949
// 3) RPC Engine requires this for re-establishing pooled connections over the lifetime of the client
50-
new PrivateCredentialPermission("org.apache.hadoop.security.Credentials * \"*\"", "read") };
50+
new PrivateCredentialPermission("org.apache.hadoop.security.Credentials * \"*\"", "read"),
51+
new RuntimePermission("getClassLoader") };
5152

5253
// If Security is enabled, we need all the following elevated permissions:
5354
KERBEROS_AUTH_PERMISSIONS = new Permission[] {

0 commit comments

Comments
 (0)