Skip to content

Commit 3c5a005

Browse files
steveloughranKeeProMise
authored andcommitted
HADOOP-19252. Upgrade hadoop-thirdparty to 1.3.0 (apache#7007)
Update the version of hadoop-thirdparty to 1.3.0 across all shaded artifacts used. This synchronizes the shaded protobuf library with those of all other shaded artifacts (guava, avro) Contributed by Steve Loughran
1 parent 35b4753 commit 3c5a005

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

LICENSE-binary

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,19 +233,19 @@ com.google:guice:5.1.0
233233
com.google:guice-servlet:5.1.0
234234
com.google.api.grpc:proto-google-common-protos:1.0.0
235235
com.google.code.gson:2.9.0
236-
com.google.errorprone:error_prone_annotations:2.2.0
237-
com.google.j2objc:j2objc-annotations:1.1
236+
com.google.errorprone:error_prone_annotations:2.5.1
237+
com.google.j2objc:j2objc-annotations:1.3
238238
com.google.json-simple:json-simple:1.1.1
239239
com.google.guava:failureaccess:1.0
240240
com.google.guava:guava:20.0
241-
com.google.guava:guava:27.0-jre
241+
com.google.guava:guava:32.0.1-jre
242242
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
243243
com.microsoft.azure:azure-storage:7.0.0
244244
com.nimbusds:nimbus-jose-jwt:9.37.2
245245
com.zaxxer:HikariCP:4.0.3
246246
commons-beanutils:commons-beanutils:1.9.4
247247
commons-cli:commons-cli:1.5.0
248-
commons-codec:commons-codec:1.11
248+
commons-codec:commons-codec:1.15
249249
commons-collections:commons-collections:3.2.2
250250
commons-daemon:commons-daemon:1.0.13
251251
commons-io:commons-io:2.16.1
@@ -298,6 +298,7 @@ javax.inject:javax.inject:1
298298
net.java.dev.jna:jna:5.2.0
299299
net.minidev:accessors-smart:1.2
300300
org.apache.avro:avro:1.9.2
301+
org.apache.avro:avro:1.11.3
301302
org.apache.commons:commons-collections4:4.2
302303
org.apache.commons:commons-compress:1.26.1
303304
org.apache.commons:commons-configuration2:2.10.1
@@ -362,7 +363,7 @@ org.objenesis:objenesis:2.6
362363
org.xerial.snappy:snappy-java:1.1.10.4
363364
org.yaml:snakeyaml:2.0
364365
org.wildfly.openssl:wildfly-openssl:1.1.3.Final
365-
software.amazon.awssdk:bundle:jar:2.25.53
366+
software.amazon.awssdk:bundle:2.25.53
366367

367368

368369
--------------------------------------------------------------------------------
@@ -395,7 +396,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/d3-3.5.17.min.js
395396
leveldb v1.13
396397

397398
com.google.protobuf:protobuf-java:2.5.0
398-
com.google.protobuf:protobuf-java:3.21.12
399+
com.google.protobuf:protobuf-java:3.25.3
399400
com.google.re2j:re2j:1.1
400401
com.jcraft:jsch:0.1.55
401402
com.thoughtworks.paranamer:paranamer:2.3
@@ -485,7 +486,7 @@ com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7
485486
org.bouncycastle:bcpkix-jdk18on:1.78.1
486487
org.bouncycastle:bcprov-jdk18on:1.78.1
487488
org.bouncycastle:bcutil-jdk18on:1.78.1
488-
org.checkerframework:checker-qual:2.5.2
489+
org.checkerframework:checker-qual:3.8.0
489490
org.codehaus.mojo:animal-sniffer-annotations:1.21
490491
org.jruby.jcodings:jcodings:1.0.13
491492
org.jruby.joni:joni:2.1.2

hadoop-project/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
<hadoop.protobuf.version>3.23.4</hadoop.protobuf.version>
9797
<protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
9898

99-
<hadoop-thirdparty.version>1.2.0</hadoop-thirdparty.version>
100-
<hadoop-thirdparty-protobuf.version>1.3.0-SNAPSHOT</hadoop-thirdparty-protobuf.version>
99+
<hadoop-thirdparty.version>1.3.0</hadoop-thirdparty.version>
100+
<hadoop-thirdparty-protobuf.version>${hadoop-thirdparty.version}</hadoop-thirdparty-protobuf.version>
101101
<hadoop-thirdparty-guava.version>${hadoop-thirdparty.version}</hadoop-thirdparty-guava.version>
102102
<hadoop-thirdparty-shaded-prefix>org.apache.hadoop.thirdparty</hadoop-thirdparty-shaded-prefix>
103103
<hadoop-thirdparty-shaded-protobuf-prefix>${hadoop-thirdparty-shaded-prefix}.protobuf</hadoop-thirdparty-shaded-protobuf-prefix>

0 commit comments

Comments
 (0)