Skip to content

Conversation

@nandakumar131
Copy link
Contributor

What changes were proposed in this pull request?

Enable sortpom in hadoop-hdds-interface server, admin & client

Sortpom plugin was added as part of #7555.
This PR enables the plugin for hadoop-hdds sub-modules. (part 5)
Sorting all the sub-modules under hadoop-hdds creates a big change, which will be hard to review. So, breaking this into multiple PRs.
This PR sorts pom of the following sub-modules.

  • interface-server
  • interface-admin
  • interface-client

What is the link to the Apache JIRA

HDDS-12034

How was this patch tested?

Manually tested by adding out of order property.

hadoop-hdds/interface-server/pom.xml

[INFO] --- sortpom:3.0.1:verify (default) @ hdds-interface-server ---
[INFO] Verifying file /Users/nvadivelu/Codebase/Github/ozone/hadoop-hdds/interface-server/pom.xml
[ERROR] The line 31 is not considered sorted, should be '    <property.one>one</property.one>'
[ERROR] The file /Users/nvadivelu/Codebase/Github/ozone/hadoop-hdds/interface-server/pom.xml is not sorted

hadoop-hdds/interface-admin/pom.xml

[INFO] --- sortpom:3.0.1:verify (default) @ hdds-interface-admin ---
[INFO] Verifying file /Users/nvadivelu/Codebase/Github/ozone/hadoop-hdds/interface-admin/pom.xml
[ERROR] The line 31 is not considered sorted, should be '    <property.one>one</property.one>'
[ERROR] The file /Users/nvadivelu/Codebase/Github/ozone/hadoop-hdds/interface-admin/pom.xml is not sorted

hadoop-hdds/interface-client/pom.xml

[INFO] --- sortpom:3.0.1:verify (default) @ hdds-interface-client ---
[INFO] Verifying file /Users/nvadivelu/Codebase/Github/ozone/hadoop-hdds/interface-client/pom.xml
[ERROR] The line 31 is not considered sorted, should be '    <property.one>one</property.one>'
[ERROR] The file /Users/nvadivelu/Codebase/Github/ozone/hadoop-hdds/interface-client/pom.xml is not sorted

Copy link
Contributor

@adoroszlai adoroszlai left a comment

Choose a reason for hiding this comment

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

Thanks @nandakumar131 for the patch.

Comment on lines -149 to -151
<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">
Copy link
Contributor

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

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.

@adoroszlai adoroszlai merged commit 2fc9c6e into apache:master Jan 8, 2025
41 checks passed
@nandakumar131
Copy link
Contributor Author

Thanks @adoroszlai for the review and merge!

@nandakumar131 nandakumar131 deleted the HDDS-12034 branch January 8, 2025 05:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants