This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.4.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.4.1 by this push:
new 5db50fb995b HADOOP-19252. Upgrade hadoop-thirdparty from 1.2.0 to
1.3.0 (#7007) (#7014)
5db50fb995b is described below
commit 5db50fb995b29bb301546b98866beb7b48cc8405
Author: Steve Loughran <ste...@cloudera.com>
AuthorDate: Thu Sep 5 20:53:13 2024 +0100
HADOOP-19252. Upgrade hadoop-thirdparty from 1.2.0 to 1.3.0 (#7007) (#7014)
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)
Note: this patch moves from 1.2.0; the trunk PR moves from
1.3.0-SNAPSHOT and is slightly different
Contributed by Steve Loughran
---
LICENSE-binary | 15 ++++++++-------
hadoop-common-project/hadoop-common/pom.xml | 2 +-
hadoop-project/pom.xml | 6 +++---
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml | 6 +++---
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 887e7070967..3e5698dea96 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -232,19 +232,19 @@ com.google:guice:4.0
com.google:guice-servlet:4.0
com.google.api.grpc:proto-google-common-protos:1.0.0
com.google.code.gson:2.9.0
-com.google.errorprone:error_prone_annotations:2.2.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.errorprone:error_prone_annotations:2.5.1
+com.google.j2objc:j2objc-annotations:1.3
com.google.json-simple:json-simple:1.1.1
com.google.guava:failureaccess:1.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.microsoft.azure:azure-storage:7.0.0
com.nimbusds:nimbus-jose-jwt:9.37.2
com.zaxxer:HikariCP:4.0.3
commons-beanutils:commons-beanutils:1.9.4
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-daemon:commons-daemon:1.0.13
commons-io:commons-io:2.16.1
@@ -297,6 +297,7 @@ javax.inject:javax.inject:1
net.java.dev.jna:jna:5.2.0
net.minidev:accessors-smart:1.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-compress:1.26.1
org.apache.commons:commons-configuration2:2.10.1
@@ -361,7 +362,7 @@ org.objenesis:objenesis:2.6
org.xerial.snappy:snappy-java:1.1.10.4
org.yaml:snakeyaml:2.0
org.wildfly.openssl:wildfly-openssl:1.1.3.Final
-software.amazon.awssdk:bundle:jar:2.25.53
+software.amazon.awssdk:bundle:2.25.53
--------------------------------------------------------------------------------
@@ -394,7 +395,7 @@
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/d3-3.5.17.min.js
leveldb v1.13
com.google.protobuf:protobuf-java:2.5.0
-com.google.protobuf:protobuf-java:3.6.1
+com.google.protobuf:protobuf-java:3.25.3
com.google.re2j:re2j:1.1
com.jcraft:jsch:0.1.55
com.thoughtworks.paranamer:paranamer:2.3
@@ -484,7 +485,7 @@ com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7
org.bouncycastle:bcpkix-jdk18on:1.78.1
org.bouncycastle:bcprov-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.jruby.jcodings:jcodings:1.0.13
org.jruby.joni:joni:2.1.2
diff --git a/hadoop-common-project/hadoop-common/pom.xml
b/hadoop-common-project/hadoop-common/pom.xml
index 31fd2923e99..bd0e6a3edc1 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>hadoop-shaded-protobuf_3_21</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_25</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 780b1461857..6416cc8b7dc 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -93,10 +93,10 @@
<!-- Protobuf scope in other modules which explicitly import the libarary
-->
<transient.protobuf2.scope>${common.protobuf2.scope}</transient.protobuf2.scope>
<!-- ProtocolBuffer version, actually used in Hadoop -->
- <hadoop.protobuf.version>3.21.12</hadoop.protobuf.version>
+ <hadoop.protobuf.version>3.23.4</hadoop.protobuf.version>
<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>${hadoop-thirdparty.version}</hadoop-thirdparty-protobuf.version>
<hadoop-thirdparty-guava.version>${hadoop-thirdparty.version}</hadoop-thirdparty-guava.version>
<hadoop-thirdparty-shaded-prefix>org.apache.hadoop.thirdparty</hadoop-thirdparty-shaded-prefix>
@@ -250,7 +250,7 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>hadoop-shaded-protobuf_3_21</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_25</artifactId>
<version>${hadoop-thirdparty-protobuf.version}</version>
</dependency>
<dependency>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
index 473078225e0..2b49a0ada12 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
@@ -51,7 +51,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>hadoop-shaded-protobuf_3_21</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_25</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>hadoop-shaded-protobuf_3_21</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_25</artifactId>
</dependency>
<dependency>
@@ -75,7 +75,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>hadoop-shaded-protobuf_3_21</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_25</artifactId>
</exclusion>
</exclusions>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
