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/06 04:53:21 UTC
[ozone] branch master updated: HDDS-5405. Refactor pom files for
HadoopRpc and Grpc/Ratis compilation properties. (#2386)
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 9948632 HDDS-5405. Refactor pom files for HadoopRpc and Grpc/Ratis compilation properties. (#2386)
9948632 is described below
commit 994863257890e9939f722c3db3d7743dcab5f790
Author: Mukul Kumar Singh <ms...@apache.org>
AuthorDate: Tue Jul 6 10:23:10 2021 +0530
HDDS-5405. Refactor pom files for HadoopRpc and Grpc/Ratis compilation properties. (#2386)
---
.../main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java | 3 ++-
.../src/main/java/org/apache/hadoop/hdds/utils/VersionInfo.java | 8 ++++++--
.../common/src/main/resources/hdds-version-info.properties | 3 ++-
hadoop-hdds/interface-admin/pom.xml | 2 +-
hadoop-hdds/interface-client/pom.xml | 4 ++--
hadoop-hdds/interface-server/pom.xml | 4 ++--
.../main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java | 3 ++-
.../common/src/main/resources/ozone-version-info.properties | 3 ++-
hadoop-ozone/csi/pom.xml | 6 +++---
hadoop-ozone/dist/pom.xml | 2 +-
hadoop-ozone/interface-client/pom.xml | 2 +-
hadoop-ozone/interface-storage/pom.xml | 2 +-
pom.xml | 6 +++---
13 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java
index 6356658..98c6ec1 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java
@@ -47,7 +47,8 @@ public final class HddsVersionInfo {
System.out.println("Compiled by " + HDDS_VERSION_INFO.getUser() + " on "
+ HDDS_VERSION_INFO.getDate());
System.out.println(
- "Compiled with protoc " + HDDS_VERSION_INFO.getProtocVersion());
+ "Compiled with protoc " + HDDS_VERSION_INFO.getHadoopProtocVersion() +
+ " and " + HDDS_VERSION_INFO.getGrpcProtocVersion());
System.out.println(
"From source with checksum " + HDDS_VERSION_INFO.getSrcChecksum());
if (LOG.isDebugEnabled()) {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/VersionInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/VersionInfo.java
index d836c31..fe29108 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/VersionInfo.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/VersionInfo.java
@@ -85,8 +85,12 @@ public class VersionInfo {
return info.getProperty("srcChecksum", "Unknown");
}
- public String getProtocVersion() {
- return info.getProperty("protocVersion", "Unknown");
+ public String getHadoopProtocVersion() {
+ return info.getProperty("hadoopProtocVersion", "Unknown");
+ }
+
+ public String getGrpcProtocVersion() {
+ return info.getProperty("grpcProtocVersion", "Unknown");
}
public String getBuildVersion() {
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 2cbd817..1424310 100644
--- a/hadoop-hdds/common/src/main/resources/hdds-version-info.properties
+++ b/hadoop-hdds/common/src/main/resources/hdds-version-info.properties
@@ -23,4 +23,5 @@ user=${user.name}
date=${version-info.build.time}
url=${version-info.scm.uri}
srcChecksum=${version-info.source.md5}
-protocVersion=${protobuf.version}
+hadoopProtocVersion=${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 91c1416..8e75a96 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:${protobuf.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${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 a3ccaeb..1f950c3 100644
--- a/hadoop-hdds/interface-client/pom.xml
+++ b/hadoop-hdds/interface-client/pom.xml
@@ -66,7 +66,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</goals>
<configuration>
<protocArtifact>
- com.google.protobuf:protoc:${protobuf-compile.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${grpc.protobuf-compile.version}:exe:${os.detected.classifier}
</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<includes>
@@ -89,7 +89,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</goals>
<configuration>
<protocArtifact>
- com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${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 e1c2744..7dfeca8 100644
--- a/hadoop-hdds/interface-server/pom.xml
+++ b/hadoop-hdds/interface-server/pom.xml
@@ -63,7 +63,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</goals>
<configuration>
<protocArtifact>
- com.google.protobuf:protoc:${protobuf-compile.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${grpc.protobuf-compile.version}:exe:${os.detected.classifier}
</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<includes>
@@ -86,7 +86,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</goals>
<configuration>
<protocArtifact>
- com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<excludes>
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java
index c958619..981a0c6 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java
@@ -72,7 +72,8 @@ public final class OzoneVersionInfo {
System.out.println("Compiled by " + OZONE_VERSION_INFO.getUser() + " on "
+ OZONE_VERSION_INFO.getDate());
System.out.println(
- "Compiled with protoc " + OZONE_VERSION_INFO.getProtocVersion());
+ "Compiled with protoc " + OZONE_VERSION_INFO.getHadoopProtocVersion()
+ + " and " + OZONE_VERSION_INFO.getGrpcProtocVersion());
System.out.println(
"From source with checksum " + OZONE_VERSION_INFO.getSrcChecksum());
System.out.println(
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 599f14d..34c586d 100644
--- a/hadoop-ozone/common/src/main/resources/ozone-version-info.properties
+++ b/hadoop-ozone/common/src/main/resources/ozone-version-info.properties
@@ -24,4 +24,5 @@ user=${user.name}
date=${version-info.build.time}
url=${version-info.scm.uri}
srcChecksum=${version-info.source.md5}
-protocVersion=${protobuf.version}
+hadoopProtocVersion=${hadooprpc.protobuf.version}
+grpcProtocVersion=${grpc.protobuf-compile.version}
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index 9504465..fa8cb07 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -32,7 +32,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
- <version>${protobuf-compile.version}</version>
+ <version>${grpc.protobuf-compile.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
@@ -62,7 +62,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>${protobuf-compile.version}</version>
+ <version>${grpc.protobuf-compile.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -146,7 +146,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<extensions>true</extensions>
<configuration>
<protocArtifact>
- com.google.protobuf:protoc:${protobuf-compile.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${grpc.protobuf-compile.version}:exe:${os.detected.classifier}
</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<includes>
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index a2a18ff..980ab8e 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -103,7 +103,7 @@
<artifactItem>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>${protobuf-compile.version}</version>
+ <version>${grpc.protobuf-compile.version}</version>
</artifactItem>
</artifactItems>
</configuration>
diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml
index d4b16fd..08b3575 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:${protobuf.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${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 c7ce7d2..0c017fe 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:${protobuf.version}:exe:${os.detected.classifier}
+ com.google.protobuf:protoc:${hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
</configuration>
</execution>
diff --git a/pom.xml b/pom.xml
index 2773c69..2cdca42 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 -->
- <protobuf.version>2.5.0</protobuf.version>
+ <hadooprpc.protobuf.version>2.5.0</hadooprpc.protobuf.version>
<findbugs.version>3.0.0</findbugs.version>
<spotbugs.version>3.1.12</spotbugs.version>
@@ -172,7 +172,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<!-- Maven protoc compiler -->
<protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
- <protobuf-compile.version>3.12.0</protobuf-compile.version>
+ <grpc.protobuf-compile.version>3.12.0</grpc.protobuf-compile.version>
<grpc-compile.version>1.33.0</grpc-compile.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
@@ -1302,7 +1302,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>${protobuf.version}</version>
+ <version>${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