Skip to content

HDDS-12034. Enable sortpom in hadoop-hdds-interface server, admin & client #7660

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
adoroszlai merged 1 commit into from
Jan 8, 2025
Merged

HDDS-12034. Enable sortpom in hadoop-hdds-interface server, admin & client #7660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 8 additions & 13 deletions hadoop-hdds/interface-admin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
Expand All @@ -24,15 +21,15 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</parent>
<artifactId>hdds-interface-admin</artifactId>
<version>2.0.0-SNAPSHOT</version>
<description>Apache Ozone Distributed Data Store Admin interface
</description>
<name>Apache Ozone HDDS Admin Interface</name>
<packaging>jar</packaging>
<name>Apache Ozone HDDS Admin Interface</name>
<description>Apache Ozone Distributed Data Store Admin interface</description>

<properties>
<maven.test.skip>true</maven.test.skip> <!-- no testable code in this module -->
<spotbugs.skip>true</spotbugs.skip> <!-- only generated code in this module -->
<sort.skip>true</sort.skip>
<!-- no testable code in this module -->
<maven.test.skip>true</maven.test.skip>
<!-- only generated code in this module -->
<spotbugs.skip>true</spotbugs.skip>
</properties>

<dependencies>
Expand Down Expand Up @@ -72,9 +69,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<goal>test-compile</goal>
</goals>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<protocArtifact>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>
<clearOutputDirectory>false</clearOutputDirectory>
Expand Down
78 changes: 25 additions & 53 deletions hadoop-hdds/interface-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
Expand All @@ -24,22 +21,26 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</parent>
<artifactId>hdds-interface-client</artifactId>
<version>2.0.0-SNAPSHOT</version>
<description>Apache Ozone Distributed Data Store Client interface
</description>
<name>Apache Ozone HDDS Client Interface</name>
<packaging>jar</packaging>
<name>Apache Ozone HDDS Client Interface</name>
<description>Apache Ozone Distributed Data Store Client interface</description>

<properties>
<maven.test.skip>true</maven.test.skip> <!-- no testable code in this module -->
<spotbugs.skip>true</spotbugs.skip> <!-- only generated code in this module -->
<sort.skip>true</sort.skip>
<!-- no testable code in this module -->
<maven.test.skip>true</maven.test.skip>
<!-- only generated code in this module -->
<spotbugs.skip>true</spotbugs.skip>
</properties>

<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>hadoop-shaded-protobuf_3_25</artifactId>
Expand All @@ -49,10 +50,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>ratis-thirdparty-misc</artifactId>
<version>${ratis.thirdparty.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -82,9 +79,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<goal>test-compile-custom</goal>
</goals>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${grpc.protobuf-compile.version}:exe:${os.detected.classifier}
</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${grpc.protobuf-compile.version}:exe:${os.detected.classifier}</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<includes>
<include>DatanodeClientProtocol.proto</include>
Expand All @@ -93,9 +88,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<outputDirectory>target/generated-sources/java</outputDirectory>
<clearOutputDirectory>false</clearOutputDirectory>
<pluginId>grpc-java</pluginId>
<pluginArtifact>
io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}
</pluginArtifact>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
</execution>
<execution>
Expand All @@ -105,9 +98,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<goal>test-compile</goal>
</goals>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<includes>
<include>hdds.proto</include>
Expand All @@ -124,9 +115,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<goal>test-compile</goal>
</goals>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${proto3.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${proto3.hadooprpc.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<includes>
<include>hdds.proto</include>
Expand All @@ -143,38 +132,21 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>run</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<target>
<replace token="com.google.protobuf"
value="org.apache.ratis.thirdparty.com.google.protobuf"
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/datanode/proto">
Comment on lines -149 to -151
Copy link
Contributor

@adoroszlai adoroszlai Jan 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find the original format more readable, but the option in sortpom to preserve this (indentAttribute) is available only in newer versions that do not support Java 8.

Copy link
Contributor Author

@nandakumar131 nandakumar131 Jan 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Me too. The original format was easy to read.
Let's revisit this once we move to the newer version.

</replace>
<replace token="io.grpc"
value="org.apache.ratis.thirdparty.io.grpc"
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/datanode/proto">
</replace>
<replace token="com.google.common"
value="org.apache.ratis.thirdparty.com.google.common"
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/datanode/proto">
</replace>
<replace token="org.apache.hadoop.hdds.protocol.proto"
value="org.apache.hadoop.hdds.protocol.proto3"
dir="target/generated-sources/java/proto3/org/apache/hadoop/hdds/protocol/proto">
</replace>
<replace token="com.google.protobuf"
value="org.apache.hadoop.thirdparty.protobuf"
dir="target/generated-sources/java/proto3/org/apache/hadoop/hdds/protocol/proto">
</replace>
<move file="target/generated-sources/java/proto3/org/apache/hadoop/hdds/protocol/proto"
tofile="target/generated-sources/java/proto3/org/apache/hadoop/hdds/protocol/proto3"/>
<move file="target/generated-sources/java/proto3"
tofile="target/generated-sources/java"/>
<replace dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/datanode/proto" token="com.google.protobuf" value="org.apache.ratis.thirdparty.com.google.protobuf" />
<replace dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/datanode/proto" token="io.grpc" value="org.apache.ratis.thirdparty.io.grpc" />
<replace dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/datanode/proto" token="com.google.common" value="org.apache.ratis.thirdparty.com.google.common" />
<replace dir="target/generated-sources/java/proto3/org/apache/hadoop/hdds/protocol/proto" token="org.apache.hadoop.hdds.protocol.proto" value="org.apache.hadoop.hdds.protocol.proto3" />
<replace dir="target/generated-sources/java/proto3/org/apache/hadoop/hdds/protocol/proto" token="com.google.protobuf" value="org.apache.hadoop.thirdparty.protobuf" />
<move file="target/generated-sources/java/proto3/org/apache/hadoop/hdds/protocol/proto" tofile="target/generated-sources/java/proto3/org/apache/hadoop/hdds/protocol/proto3" />
<move file="target/generated-sources/java/proto3" tofile="target/generated-sources/java" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
Expand Down
58 changes: 20 additions & 38 deletions hadoop-hdds/interface-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
Expand All @@ -24,22 +21,18 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</parent>
<artifactId>hdds-interface-server</artifactId>
<version>2.0.0-SNAPSHOT</version>
<description>Apache Ozone Distributed Data Store Server interface
</description>
<name>Apache Ozone HDDS Server Interface</name>
<packaging>jar</packaging>
<name>Apache Ozone HDDS Server Interface</name>
<description>Apache Ozone Distributed Data Store Server interface</description>

<properties>
<maven.test.skip>true</maven.test.skip> <!-- no testable code in this module -->
<spotbugs.skip>true</spotbugs.skip> <!-- only generated code in this module -->
<sort.skip>true</sort.skip>
<!-- no testable code in this module -->
<maven.test.skip>true</maven.test.skip>
<!-- only generated code in this module -->
<spotbugs.skip>true</spotbugs.skip>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand All @@ -50,6 +43,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -79,9 +76,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<goal>test-compile-custom</goal>
</goals>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${grpc.protobuf-compile.version}:exe:${os.detected.classifier}
</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${grpc.protobuf-compile.version}:exe:${os.detected.classifier}</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<includes>
<include>InterSCMProtocol.proto</include>
Expand All @@ -90,9 +85,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<outputDirectory>target/generated-sources/java</outputDirectory>
<clearOutputDirectory>false</clearOutputDirectory>
<pluginId>grpc-java</pluginId>
<pluginArtifact>
io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}
</pluginArtifact>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
</execution>
<execution>
Expand All @@ -102,9 +95,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<goal>test-compile</goal>
</goals>
<configuration>
<protocArtifact>
com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${proto2.hadooprpc.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
<excludes>
<exclude>InterSCMProtocol.proto</exclude>
Expand All @@ -121,26 +112,17 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>run</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<target>
<replace token="com.google.protobuf"
value="org.apache.ratis.thirdparty.com.google.protobuf"
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto">
</replace>
<replace token="io.grpc"
value="org.apache.ratis.thirdparty.io.grpc"
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto">
</replace>
<replace token="com.google.common"
value="org.apache.ratis.thirdparty.com.google.common"
dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto">
</replace>
<replace dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto" token="com.google.protobuf" value="org.apache.ratis.thirdparty.com.google.protobuf" />
<replace dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto" token="io.grpc" value="org.apache.ratis.thirdparty.io.grpc" />
<replace dir="target/generated-sources/java/org/apache/hadoop/hdds/protocol/scm/proto" token="com.google.common" value="org.apache.ratis.thirdparty.com.google.common" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
Expand Down
Loading