HADOOP-19252. Upgrade hadoop-thirdparty to 1.3.0 (#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
This commit is contained in:
Steve Loughran 2024-08-30 11:50:51 +01:00 committed by GitHub
parent a962aa37e0
commit b404c8c8f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 9 deletions

View File

@ -233,19 +233,19 @@ com.google:guice:5.1.0
com.google:guice-servlet:5.1.0 com.google:guice-servlet:5.1.0
com.google.api.grpc:proto-google-common-protos:1.0.0 com.google.api.grpc:proto-google-common-protos:1.0.0
com.google.code.gson:2.9.0 com.google.code.gson:2.9.0
com.google.errorprone:error_prone_annotations:2.2.0 com.google.errorprone:error_prone_annotations:2.5.1
com.google.j2objc:j2objc-annotations:1.1 com.google.j2objc:j2objc-annotations:1.3
com.google.json-simple:json-simple:1.1.1 com.google.json-simple:json-simple:1.1.1
com.google.guava:failureaccess:1.0 com.google.guava:failureaccess:1.0
com.google.guava:guava:20.0 com.google.guava:guava:20.0
com.google.guava:guava:27.0-jre com.google.guava:guava:32.0.1-jre
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
com.microsoft.azure:azure-storage:7.0.0 com.microsoft.azure:azure-storage:7.0.0
com.nimbusds:nimbus-jose-jwt:9.37.2 com.nimbusds:nimbus-jose-jwt:9.37.2
com.zaxxer:HikariCP:4.0.3 com.zaxxer:HikariCP:4.0.3
commons-beanutils:commons-beanutils:1.9.4 commons-beanutils:commons-beanutils:1.9.4
commons-cli:commons-cli:1.5.0 commons-cli:commons-cli:1.5.0
commons-codec:commons-codec:1.11 commons-codec:commons-codec:1.15
commons-collections:commons-collections:3.2.2 commons-collections:commons-collections:3.2.2
commons-daemon:commons-daemon:1.0.13 commons-daemon:commons-daemon:1.0.13
commons-io:commons-io:2.16.1 commons-io:commons-io:2.16.1
@ -298,6 +298,7 @@ javax.inject:javax.inject:1
net.java.dev.jna:jna:5.2.0 net.java.dev.jna:jna:5.2.0
net.minidev:accessors-smart:1.2 net.minidev:accessors-smart:1.2
org.apache.avro:avro:1.9.2 org.apache.avro:avro:1.9.2
org.apache.avro:avro:1.11.3
org.apache.commons:commons-collections4:4.2 org.apache.commons:commons-collections4:4.2
org.apache.commons:commons-compress:1.26.1 org.apache.commons:commons-compress:1.26.1
org.apache.commons:commons-configuration2:2.10.1 org.apache.commons:commons-configuration2:2.10.1
@ -362,7 +363,7 @@ org.objenesis:objenesis:2.6
org.xerial.snappy:snappy-java:1.1.10.4 org.xerial.snappy:snappy-java:1.1.10.4
org.yaml:snakeyaml:2.0 org.yaml:snakeyaml:2.0
org.wildfly.openssl:wildfly-openssl:1.1.3.Final org.wildfly.openssl:wildfly-openssl:1.1.3.Final
software.amazon.awssdk:bundle:jar:2.25.53 software.amazon.awssdk:bundle:2.25.53
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -395,7 +396,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/d3-3.5.17.min.js
leveldb v1.13 leveldb v1.13
com.google.protobuf:protobuf-java:2.5.0 com.google.protobuf:protobuf-java:2.5.0
com.google.protobuf:protobuf-java:3.21.12 com.google.protobuf:protobuf-java:3.25.3
com.google.re2j:re2j:1.1 com.google.re2j:re2j:1.1
com.jcraft:jsch:0.1.55 com.jcraft:jsch:0.1.55
com.thoughtworks.paranamer:paranamer:2.3 com.thoughtworks.paranamer:paranamer:2.3
@ -485,7 +486,7 @@ com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7
org.bouncycastle:bcpkix-jdk18on:1.78.1 org.bouncycastle:bcpkix-jdk18on:1.78.1
org.bouncycastle:bcprov-jdk18on:1.78.1 org.bouncycastle:bcprov-jdk18on:1.78.1
org.bouncycastle:bcutil-jdk18on:1.78.1 org.bouncycastle:bcutil-jdk18on:1.78.1
org.checkerframework:checker-qual:2.5.2 org.checkerframework:checker-qual:3.8.0
org.codehaus.mojo:animal-sniffer-annotations:1.21 org.codehaus.mojo:animal-sniffer-annotations:1.21
org.jruby.jcodings:jcodings:1.0.13 org.jruby.jcodings:jcodings:1.0.13
org.jruby.joni:joni:2.1.2 org.jruby.joni:joni:2.1.2

View File

@ -96,8 +96,8 @@
<hadoop.protobuf.version>3.23.4</hadoop.protobuf.version> <hadoop.protobuf.version>3.23.4</hadoop.protobuf.version>
<protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path> <protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
<hadoop-thirdparty.version>1.2.0</hadoop-thirdparty.version> <hadoop-thirdparty.version>1.3.0</hadoop-thirdparty.version>
<hadoop-thirdparty-protobuf.version>1.3.0-SNAPSHOT</hadoop-thirdparty-protobuf.version> <hadoop-thirdparty-protobuf.version>${hadoop-thirdparty.version}</hadoop-thirdparty-protobuf.version>
<hadoop-thirdparty-guava.version>${hadoop-thirdparty.version}</hadoop-thirdparty-guava.version> <hadoop-thirdparty-guava.version>${hadoop-thirdparty.version}</hadoop-thirdparty-guava.version>
<hadoop-thirdparty-shaded-prefix>org.apache.hadoop.thirdparty</hadoop-thirdparty-shaded-prefix> <hadoop-thirdparty-shaded-prefix>org.apache.hadoop.thirdparty</hadoop-thirdparty-shaded-prefix>
<hadoop-thirdparty-shaded-protobuf-prefix>${hadoop-thirdparty-shaded-prefix}.protobuf</hadoop-thirdparty-shaded-protobuf-prefix> <hadoop-thirdparty-shaded-protobuf-prefix>${hadoop-thirdparty-shaded-prefix}.protobuf</hadoop-thirdparty-shaded-protobuf-prefix>