Skip to content

Commit 8011b21

Browse files
authored
HADOOP-19069. Use hadoop-thirdparty 1.2.0. (apache#6533) Contributed by Shilun Fan
Reviewed-by: He Xiaoqiao <[email protected]> Signed-off-by: Shilun Fan <[email protected]>
1 parent 3f98cb6 commit 8011b21

File tree

3 files changed

+7
-7
lines changed
  • hadoop-common-project/hadoop-common
  • hadoop-project
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api

3 files changed

+7
-7
lines changed

hadoop-common-project/hadoop-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependencies>
4141
<dependency>
4242
<groupId>org.apache.hadoop.thirdparty</groupId>
43-
<artifactId>hadoop-shaded-protobuf_3_7</artifactId>
43+
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.apache.hadoop</groupId>

hadoop-project/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@
9393
<!-- Protobuf scope in other modules which explicitly import the libarary -->
9494
<transient.protobuf2.scope>${common.protobuf2.scope}</transient.protobuf2.scope>
9595
<!-- ProtocolBuffer version, actually used in Hadoop -->
96-
<hadoop.protobuf.version>3.7.1</hadoop.protobuf.version>
96+
<hadoop.protobuf.version>3.21.12</hadoop.protobuf.version>
9797
<protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
9898

99-
<hadoop-thirdparty.version>1.1.1</hadoop-thirdparty.version>
99+
<hadoop-thirdparty.version>1.2.0</hadoop-thirdparty.version>
100100
<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>
@@ -250,7 +250,7 @@
250250
</dependency>
251251
<dependency>
252252
<groupId>org.apache.hadoop.thirdparty</groupId>
253-
<artifactId>hadoop-shaded-protobuf_3_7</artifactId>
253+
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
254254
<version>${hadoop-thirdparty-protobuf.version}</version>
255255
</dependency>
256256
<dependency>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<exclusions>
5252
<exclusion>
5353
<groupId>org.apache.hadoop.thirdparty</groupId>
54-
<artifactId>hadoop-shaded-protobuf_3_7</artifactId>
54+
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
5555
</exclusion>
5656
</exclusions>
5757
</dependency>
@@ -69,7 +69,7 @@
6969

7070
<dependency>
7171
<groupId>org.apache.hadoop.thirdparty</groupId>
72-
<artifactId>hadoop-shaded-protobuf_3_7</artifactId>
72+
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
7373
</dependency>
7474

7575
<dependency>
@@ -80,7 +80,7 @@
8080
<exclusions>
8181
<exclusion>
8282
<groupId>org.apache.hadoop.thirdparty</groupId>
83-
<artifactId>hadoop-shaded-protobuf_3_7</artifactId>
83+
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
8484
</exclusion>
8585
</exclusions>
8686
</dependency>

0 commit comments

Comments
 (0)