Skip to content

HDDS-5405. Refactor pom files for HadoopRpc and Grpc/Ratis compilation properties. #2386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mukul1987 merged 5 commits into from
Jul 6, 2021
Merged

HDDS-5405. Refactor pom files for HadoopRpc and Grpc/Ratis compilation properties. #2386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e80203
HDDS-5405. Refactor pom files for HadoopRpc and Grpc/Ratis compilatio…
mukul1987 Jul 3, 2021
6ea0a4c
fix version command
mukul1987 Jul 5, 2021
649d9c0
fix version
mukul1987 Jul 5, 2021
6eb31e4
fix ozone version
mukul1987 Jul 5, 2021
6d09e68
trigger new CI check
mukul1987 Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/HddsVersionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ public static void main(String[] args) {
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()) {
Expand Down
8 changes: 6 additions & 2 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/VersionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,12 @@ public String getSrcChecksum() {
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() {
Expand Down
3 changes: 2 additions & 1 deletion hadoop-hdds/common/src/main/resources/hdds-version-info.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion hadoop-hdds/interface-admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-hdds/interface-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-hdds/interface-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/util/OzoneVersionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ public static void main(String[] args) {
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(
Expand Down
3 changes: 2 additions & 1 deletion hadoop-ozone/common/src/main/resources/ozone-version-info.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
6 changes: 3 additions & 3 deletions hadoop-ozone/csi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/interface-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/interface-storage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down