You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2022/03/22 06:21:51 UTC
[hadoop] branch branch-3.3 updated: YARN-10747. Bump YARN CSI protobuf version to 3.7.1 (#2946)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 4153c16 YARN-10747. Bump YARN CSI protobuf version to 3.7.1 (#2946)
4153c16 is described below
commit 4153c16324319f16c6e6148c740d61e63e8ca8a6
Author: Siyao Meng <50...@users.noreply.github.com>
AuthorDate: Tue Apr 27 20:44:13 2021 -0700
YARN-10747. Bump YARN CSI protobuf version to 3.7.1 (#2946)
Signed-off-by: Akira Ajisaka <aa...@apache.org>
Change-Id: Ib2a4bf775a5804641a91c6f9a486772c9d87c17e
(cherry picked from commit 5b09ba75eccab4c2f1850bcc4cd8e60241cb500e)
---
.../hadoop-yarn/hadoop-yarn-csi/pom.xml | 40 ++++++++++++++++++++--
1 file changed, 37 insertions(+), 3 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
index e0af8fb..53196b7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
@@ -26,7 +26,6 @@
<packaging>jar</packaging>
<properties>
- <protobuf.version>3.6.1</protobuf.version>
<grpc.version>1.26.0</grpc.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
</properties>
@@ -39,7 +38,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>${protobuf.version}</version>
+ <version>${hadoop.protobuf.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -54,6 +53,13 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
+ <exclusions>
+ <!-- Exclude protobuf-java 2.5.0 -->
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -91,21 +97,49 @@
<artifactId>hadoop-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
+ <exclusions>
+ <!-- Exclude protobuf-java 2.5.0 -->
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <!-- Exclude protobuf-java 2.5.0 -->
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <!-- Exclude protobuf-java 2.5.0 -->
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-api</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <!-- Exclude protobuf-java 2.5.0 -->
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -158,7 +192,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${protobuf-maven-plugin.version}</version>
<configuration>
- <protocArtifact>com.google.protobuf:protoc:3.6.1:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:${hadoop.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.26.0:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org