This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 a8f208c952b HDDS-13761. Remove hadoop-thirdparty protobuf compilation
(#9125)
a8f208c952b is described below
commit a8f208c952be302567b4a0f6d40761ab8c203736
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Dec 3 14:06:39 2025 +0100
HDDS-13761. Remove hadoop-thirdparty protobuf compilation (#9125)
---
.../main/resources/hdds-version-info.properties | 2 +-
hadoop-hdds/interface-client/pom.xml | 26 --------------
.../main/resources/ozone-version-info.properties | 2 +-
hadoop-ozone/interface-client/pom.xml | 41 ----------------------
.../interface-client/src/main/proto/Security.proto | 1 -
hadoop-ozone/ozonefs-hadoop2/pom.xml | 4 ---
hadoop-ozone/ozonefs-hadoop3/pom.xml | 4 ---
pom.xml | 9 -----
8 files changed, 2 insertions(+), 87 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 38ce15bf2d9..534520b82f9 100644
--- a/hadoop-hdds/common/src/main/resources/hdds-version-info.properties
+++ b/hadoop-hdds/common/src/main/resources/hdds-version-info.properties
@@ -20,5 +20,5 @@ version=${declared.hdds.version}
revision=${version-info.scm.commit}
url=${version-info.scm.uri}
srcChecksum=${version-info.source.md5}
-protoVersions=${protobuf2.version}, ${protobuf3.version},
${hadoop-thirdparty.protobuf.version} (Hadoop),
${ratis-thirdparty.protobuf.version} (Ratis)
+protoVersions=${protobuf2.version}, ${protobuf3.version},
${ratis-thirdparty.protobuf.version} (Ratis)
compilePlatform=${os.detected.classifier}
diff --git a/hadoop-hdds/interface-client/pom.xml
b/hadoop-hdds/interface-client/pom.xml
index 81c4d601321..5b9747fbbe2 100644
--- a/hadoop-hdds/interface-client/pom.xml
+++ b/hadoop-hdds/interface-client/pom.xml
@@ -37,10 +37,6 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>${hadoop-thirdparty.protobuf.artifact}</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
@@ -103,22 +99,6 @@
<clearOutputDirectory>false</clearOutputDirectory>
</configuration>
</execution>
- <execution>
- <id>compile-proto-for-hadoop</id>
- <goals>
- <goal>compile</goal>
- <goal>test-compile</goal>
- </goals>
- <configuration>
-
<protocArtifact>com.google.protobuf:protoc:${hadoop-thirdparty.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
- <includes>
- <include>hdds.proto</include>
- <include>ReconfigureProtocol.proto</include>
- </includes>
-
<outputDirectory>target/generated-sources/proto-java-for-hadoop</outputDirectory>
- <clearOutputDirectory>false</clearOutputDirectory>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -136,12 +116,6 @@
<replace dir="target/generated-sources/proto-java-for-ratis"
token="com.google.common" value="org.apache.ratis.thirdparty.com.google.common"
/>
<replace dir="target/generated-sources/proto-java-for-ratis"
token="com.google.protobuf"
value="org.apache.ratis.thirdparty.com.google.protobuf" />
<replace dir="target/generated-sources/proto-java-for-ratis"
token="io.grpc" value="org.apache.ratis.thirdparty.io.grpc" />
-
- <!-- use protobuf from hadoop-thirdparty -->
- <replace dir="target/generated-sources/proto-java-for-hadoop"
token="com.google.protobuf" value="org.apache.hadoop.thirdparty.protobuf" />
- <!-- rename package to avoid conflict -->
- <replace dir="target/generated-sources/proto-java-for-hadoop"
token="org.apache.hadoop.hdds.protocol.proto"
value="org.apache.hadoop.hdds.protocol.hadoop_proto" />
- <move
file="target/generated-sources/proto-java-for-hadoop/org/apache/hadoop/hdds/protocol/proto"
tofile="target/generated-sources/proto-java-for-hadoop/org/apache/hadoop/hdds/protocol/hadoop_proto"
/>
</target>
</configuration>
</execution>
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 02d76c04cd7..d70ebca2d5e 100644
--- a/hadoop-ozone/common/src/main/resources/ozone-version-info.properties
+++ b/hadoop-ozone/common/src/main/resources/ozone-version-info.properties
@@ -21,5 +21,5 @@ release=${ozone.release}
revision=${version-info.scm.commit}
url=${version-info.scm.uri}
srcChecksum=${version-info.source.md5}
-protoVersions=${protobuf2.version}, ${protobuf3.version},
${hadoop-thirdparty.protobuf.version} (Hadoop),
${ratis-thirdparty.protobuf.version} (Ratis)
+protoVersions=${protobuf2.version}, ${protobuf3.version},
${ratis-thirdparty.protobuf.version} (Ratis)
compilePlatform=${os.detected.classifier}
diff --git a/hadoop-ozone/interface-client/pom.xml
b/hadoop-ozone/interface-client/pom.xml
index 412181d8f09..88a7b042d4f 100644
--- a/hadoop-ozone/interface-client/pom.xml
+++ b/hadoop-ozone/interface-client/pom.xml
@@ -65,10 +65,6 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>${hadoop-thirdparty.protobuf.artifact}</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-client</artifactId>
@@ -123,43 +119,6 @@
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
</execution>
- <execution>
- <id>compile-proto-for-hadoop</id>
- <goals>
- <goal>compile</goal>
- <goal>test-compile</goal>
- </goals>
- <configuration>
-
<protocArtifact>com.google.protobuf:protoc:${hadoop-thirdparty.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
-
<outputDirectory>target/generated-sources/proto-java-for-hadoop</outputDirectory>
- <clearOutputDirectory>false</clearOutputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <target>
- <!-- use protobuf from hadoop-thirdparty -->
- <replace dir="target/generated-sources/proto-java-for-hadoop"
token="com.google.protobuf" value="org.apache.hadoop.thirdparty.protobuf" />
- <!-- use matching hdds proto -->
- <replace dir="target/generated-sources/proto-java-for-hadoop"
token="org.apache.hadoop.hdds.protocol.proto"
value="org.apache.hadoop.hdds.protocol.hadoop_proto" />
- <!-- rename packages to avoid conflict -->
- <replace dir="target/generated-sources/proto-java-for-hadoop"
token="org.apache.hadoop.ozone.protocol.proto"
value="org.apache.hadoop.ozone.protocol.hadoop_proto" />
- <replace dir="target/generated-sources/proto-java-for-hadoop"
token="org.apache.hadoop.ozone.security.proto"
value="org.apache.hadoop.ozone.security.hadoop_proto" />
- <move
file="target/generated-sources/proto-java-for-hadoop/org/apache/hadoop/ozone/protocol/proto"
tofile="target/generated-sources/proto-java-for-hadoop/org/apache/hadoop/ozone/protocol/hadoop_proto"
/>
- <move
file="target/generated-sources/proto-java-for-hadoop/org/apache/hadoop/ozone/security/proto"
tofile="target/generated-sources/proto-java-for-hadoop/org/apache/hadoop/ozone/security/hadoop_proto"
/>
- </target>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
diff --git a/hadoop-ozone/interface-client/src/main/proto/Security.proto
b/hadoop-ozone/interface-client/src/main/proto/Security.proto
index 65cbf48ba32..8f51f298fac 100644
--- a/hadoop-ozone/interface-client/src/main/proto/Security.proto
+++ b/hadoop-ozone/interface-client/src/main/proto/Security.proto
@@ -22,7 +22,6 @@
* for what changes are allowed for a *stable* .proto interface.
*/
-//Use ozone specific security proto until start using hadoop-thirdparty shaded
protobuf everywhere.
syntax = "proto2";
option java_package = "org.apache.hadoop.ozone.security.proto";
option java_outer_classname = "SecurityProtos";
diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml
b/hadoop-ozone/ozonefs-hadoop2/pom.xml
index aa12f41f6be..fc8a5c6cd8e 100644
--- a/hadoop-ozone/ozonefs-hadoop2/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml
@@ -28,10 +28,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>${hadoop-thirdparty.protobuf.artifact}</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-filesystem-shaded</artifactId>
diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml
b/hadoop-ozone/ozonefs-hadoop3/pom.xml
index 050b8268ea7..5a751541481 100644
--- a/hadoop-ozone/ozonefs-hadoop3/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml
@@ -28,10 +28,6 @@
<maven.test.skip>true</maven.test.skip>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>${hadoop-thirdparty.protobuf.artifact}</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-filesystem-shaded</artifactId>
diff --git a/pom.xml b/pom.xml
index c7b78be6eee..96e2d0d432f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,10 +95,6 @@
<gson.version>2.13.1</gson.version>
<guava.version>33.5.0-jre</guava.version>
<guice.version>6.0.0</guice.version>
- <!-- versions included in hadoop-thirdparty, update in sync (+ jar-report
and LICENSE) -->
-
<hadoop-thirdparty.protobuf.artifact>hadoop-shaded-protobuf_3_25</hadoop-thirdparty.protobuf.artifact>
-
<hadoop-thirdparty.protobuf.version>3.25.5</hadoop-thirdparty.protobuf.version>
- <hadoop-thirdparty.version>1.4.0</hadoop-thirdparty.version>
<hadoop.version>3.4.2</hadoop.version>
<hadoop2.version>2.10.2</hadoop2.version>
<hamcrest.version>2.2</hamcrest.version>
@@ -961,11 +957,6 @@
<artifactId>hadoop-sls</artifactId>
<version>${hadoop.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop.thirdparty</groupId>
- <artifactId>${hadoop-thirdparty.protobuf.artifact}</artifactId>
- <version>${hadoop-thirdparty.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
