You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ms...@apache.org on 2021/07/13 07:48:53 UTC
[ozone] branch master updated: HDDS-5433. Rename hadooprpc proto
compilation in pom to refer to proto2. (#2407)
This is an automated email from the ASF dual-hosted git repository.
msingh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new f44440b HDDS-5433. Rename hadooprpc proto compilation in pom to refer to proto2. (#2407)
f44440b is described below
commit f44440b44fe7523cbae25c9192a80e79a5c6d196
Author: Mukul Kumar Singh <ms...@apache.org>
AuthorDate: Tue Jul 13 13:18:33 2021 +0530
HDDS-5433. Rename hadooprpc proto compilation in pom to refer to proto2. (#2407)
---
hadoop-hdds/common/src/main/resources/hdds-version-info.properties | 2 +-
hadoop-hdds/interface-admin/pom.xml | 2 +-
hadoop-hdds/interface-client/pom.xml | 2 +-
hadoop-hdds/interface-server/pom.xml | 2 +-
hadoop-ozone/common/src/main/resources/ozone-version-info.properties | 2 +-
hadoop-ozone/interface-client/pom.xml | 2 +-
hadoop-ozone/interface-storage/pom.xml | 2 +-
pom.xml | 4 ++--
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hadoop-hdds/common/src/main/resources/hdds-version-info.properties b/hadoop-hdds/common/src/main/resources/hdds-version-info.properties
index 1424310..6b1e9f2 100644
--- a/hadoop-hdds/common/src/main/resources/hdds-version-info.properties
+++ b/hadoop-hdds/common/src/main/resources/hdds-version-info.properties
@@ -23,5 +23,5 @@ user=${user.name}
date=${version-info.build.time}
url=${version-info.scm.uri}
srcChecksum=${version-info.source.md5}
-hadoopProtocVersion=${hadooprpc.protobuf.version}
+hadoopProtocVersion=${proto2.hadooprpc.protobuf.version}
grpcProtocVersion=${grpc.protobuf-compile.version}
\ No newline at end of file
diff --git a/hadoop-hdds/interface-admin/pom.xml b/hadoop-hdds/interface-admin/pom.xml
index 8e75a96..e8140ac 100644
--- a/hadoop-hdds/interface-admin/pom.xml
+++ b/hadoop-hdds/interface-admin/pom.xml
@@ -60,7 +60,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</goals>
<configuration>
<protocArtifact>
- com.google.protobuf:protoc:${hadooprpc.protobuf.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<outputDirectory>target/generated-sources/java</outputDirectory>
diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml
index 1f950c3..99bffed 100644
--- a/hadoop-hdds/interface-client/pom.xml
+++ b/hadoop-hdds/interface-client/pom.xml
@@ -89,7 +89,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</goals>
<configuration>
<protocArtifact>
- com.google.protobuf:protoc:${hadooprpc.protobuf.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<includes>
diff --git a/hadoop-hdds/interface-server/pom.xml b/hadoop-hdds/interface-server/pom.xml
index 7dfeca8..2118257 100644
--- a/hadoop-hdds/interface-server/pom.xml
+++ b/hadoop-hdds/interface-server/pom.xml
@@ -86,7 +86,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</goals>
<configuration>
<protocArtifact>
- com.google.protobuf:protoc:${hadooprpc.protobuf.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<excludes>
diff --git a/hadoop-ozone/common/src/main/resources/ozone-version-info.properties b/hadoop-ozone/common/src/main/resources/ozone-version-info.properties
index 34c586d..413d174 100644
--- a/hadoop-ozone/common/src/main/resources/ozone-version-info.properties
+++ b/hadoop-ozone/common/src/main/resources/ozone-version-info.properties
@@ -24,5 +24,5 @@ user=${user.name}
date=${version-info.build.time}
url=${version-info.scm.uri}
srcChecksum=${version-info.source.md5}
-hadoopProtocVersion=${hadooprpc.protobuf.version}
+hadoopProtocVersion=${proto2.hadooprpc.protobuf.version}
grpcProtocVersion=${grpc.protobuf-compile.version}
diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml
index 08b3575..f8d1c75 100644
--- a/hadoop-ozone/interface-client/pom.xml
+++ b/hadoop-ozone/interface-client/pom.xml
@@ -59,7 +59,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<configuration>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<protocArtifact>
- com.google.protobuf:protoc:${hadooprpc.protobuf.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
</execution>
diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml
index 0c017fe..429202f 100644
--- a/hadoop-ozone/interface-storage/pom.xml
+++ b/hadoop-ozone/interface-storage/pom.xml
@@ -91,7 +91,7 @@
<configuration>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<protocArtifact>
- com.google.protobuf:protoc:${hadooprpc.protobuf.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
</execution>
diff --git a/pom.xml b/pom.xml
index 0097604..8ce215a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<!-- ProtocolBuffer version, used to verify the protoc version and -->
<!-- define the protobuf JAR version -->
- <hadooprpc.protobuf.version>2.5.0</hadooprpc.protobuf.version>
+ <proto2.hadooprpc.protobuf.version>2.5.0</proto2.hadooprpc.protobuf.version>
<findbugs.version>3.0.0</findbugs.version>
<spotbugs.version>3.1.12</spotbugs.version>
@@ -1301,7 +1301,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>${hadooprpc.protobuf.version}</version>
+ <version>${proto2.hadooprpc.protobuf.version}</version>
</dependency>
<dependency>
<groupId>commons-daemon</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org