This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new e6eeaa05abdd HADOOP-19069. Use hadoop-thirdparty 1.2.0. (#6533)
Contributed by Shilun Fan
e6eeaa05abdd is described below
commit e6eeaa05abddfcd4a55077c4ce9f71ea68cc3248
Author: slfan1989 <55643692+slfan1...@users.noreply.github.com>
AuthorDate: Thu Feb 8 19:18:04 2024 +0800
HADOOP-19069. Use hadoop-thirdparty 1.2.0. (#6533) Contributed by Shilun Fan
Reviewed-by: He Xiaoqiao <hexiaoq...@apache.org>
Signed-off-by: Shilun Fan <slfan1...@apache.org>
---
hadoop-common-project/hadoop-common/pom.xml | 2 +-
hadoop-project/pom.xml | 6 +++---
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/pom.xml
b/hadoop-common-project/hadoop-common/pom.xml
index e1d1683d7278..86ae00ead72a 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_7</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_21</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 3fc37667e1cc..a189514b9fb8 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.7.1</hadoop.protobuf.version>
+ <hadoop.protobuf.version>3.21.12</hadoop.protobuf.version>
<protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
- <hadoop-thirdparty.version>1.1.1</hadoop-thirdparty.version>
+ <hadoop-thirdparty.version>1.2.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_7</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_21</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 9bc1f1737a5a..ea01ec9cce7f 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_7</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_21</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>hadoop-shaded-protobuf_3_7</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_21</artifactId>
</dependency>
<dependency>
@@ -80,7 +80,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>hadoop-shaded-protobuf_3_7</artifactId>
+ <artifactId>hadoop-shaded-protobuf_3_21</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
