big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-19090. Use protobuf-java 3.23.4. (#6593). Contributed by PJ Fanning.

Browse Source
This commit is contained in:
PJ Fanning 2024-03-07 10:39:01 +01:00 committed by GitHub
parent 58afe43769
commit fc166d3aec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/pom.xml
View File

@ -40,7 +40,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop.thirdparty</groupId> <groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>hadoop-shaded-protobuf_3_21</artifactId> <artifactId>hadoop-shaded-protobuf_3_23</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

6
hadoop-project/pom.xml
View File

@ -93,11 +93,11 @@
<!-- Protobuf scope in other modules which explicitly import the libarary --> <!-- Protobuf scope in other modules which explicitly import the libarary -->
<transient.protobuf2.scope>${common.protobuf2.scope}</transient.protobuf2.scope> <transient.protobuf2.scope>${common.protobuf2.scope}</transient.protobuf2.scope>
<!-- ProtocolBuffer version, actually used in Hadoop --> <!-- 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> <protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
<hadoop-thirdparty.version>1.2.0</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-protobuf.version>1.3.0-SNAPSHOT</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>
@ -250,7 +250,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop.thirdparty</groupId> <groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>hadoop-shaded-protobuf_3_21</artifactId> <artifactId>hadoop-shaded-protobuf_3_23</artifactId>
<version>${hadoop-thirdparty-protobuf.version}</version> <version>${hadoop-thirdparty-protobuf.version}</version>
</dependency> </dependency>
<dependency> <dependency>

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
View File

@ -51,7 +51,7 @@
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.hadoop.thirdparty</groupId> <groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>hadoop-shaded-protobuf_3_21</artifactId> <artifactId>hadoop-shaded-protobuf_3_23</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -64,7 +64,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop.thirdparty</groupId> <groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>hadoop-shaded-protobuf_3_21</artifactId> <artifactId>hadoop-shaded-protobuf_3_23</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -75,7 +75,7 @@
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.hadoop.thirdparty</groupId> <groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>hadoop-shaded-protobuf_3_21</artifactId> <artifactId>hadoop-shaded-protobuf_3_23</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>