HADOOP-19069. Use hadoop-thirdparty 1.2.0. (#6533) Contributed by Shilun Fan
Reviewed-by: He Xiaoqiao <hexiaoqiao@apache.org> Signed-off-by: Shilun Fan <slfan1989@apache.org>
This commit is contained in:
parent
3f98cb6741
commit
8011b21c52
@ -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_7</artifactId>
|
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
|
@ -93,10 +93,10 @@
|
|||||||
<!-- 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.7.1</hadoop.protobuf.version>
|
<hadoop.protobuf.version>3.21.12</hadoop.protobuf.version>
|
||||||
<protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
|
<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-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>
|
||||||
@ -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_7</artifactId>
|
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
|
||||||
<version>${hadoop-thirdparty-protobuf.version}</version>
|
<version>${hadoop-thirdparty-protobuf.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -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_7</artifactId>
|
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
@ -69,7 +69,7 @@
|
|||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.hadoop.thirdparty</groupId>
|
<groupId>org.apache.hadoop.thirdparty</groupId>
|
||||||
<artifactId>hadoop-shaded-protobuf_3_7</artifactId>
|
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -80,7 +80,7 @@
|
|||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.apache.hadoop.thirdparty</groupId>
|
<groupId>org.apache.hadoop.thirdparty</groupId>
|
||||||
<artifactId>hadoop-shaded-protobuf_3_7</artifactId>
|
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
Loading…
Reference in New Issue
Block a user