Skip to content
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.

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

HDDS-12006. Enable sortpom in hdds-container-service, hdds-crypto-api, hdds-crypto-default, hdds-docs #7638

Merged
merged 1 commit into from
Jan 4, 2025

Conversation

nandakumar131
Copy link
Contributor

What changes were proposed in this pull request?

Enable sortpom in hadoop-hdds sub-modules : annotations, client, common & config.

Sortpom plugin was added as part of #7555.
This PR enables the plugin for hadoop-hdds sub-modules. (part 2)
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.

  • annotations
  • client
  • common
  • config

What is the link to the Apache JIRA

HDDS-12006

How was this patch tested?

Manually tested by adding out of order property.

hadoop-hdds/container-service/pom.xml

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

hadoop-hdds/crypto-api/pom.xml

[INFO] --- sortpom:3.0.1:verify (default) @ hdds-crypto-api ---
[INFO] Verifying file /Users/nvadivelu/Codebase/Github/ozone/hadoop-hdds/crypto-api/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/crypto-api/pom.xml is not sorted

hadoop-hdds/crypto-default/pom.xml

[INFO] --- sortpom:3.0.1:verify (default) @ hdds-crypto-default ---
[INFO] Verifying file /Users/nvadivelu/Codebase/Github/ozone/hadoop-hdds/crypto-default/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/crypto-default/pom.xml is not sorted

hadoop-hdds/docs/pom.xml

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

@adoroszlai adoroszlai changed the title HDDS-12006. Enable sortpom in hadoop-hdds sub-modules : container-service, crypto api & default and docs. HDDS-12006. Enable sortpom in hdds-container-service, hdds-crypto-api, hdds-crypto-default, hdds-docs Jan 4, 2025
@adoroszlai adoroszlai merged commit df6e119 into apache:master Jan 4, 2025
43 checks passed
@adoroszlai
Copy link
Contributor

Thanks @nandakumar131 for the patch.

@nandakumar131
Copy link
Contributor Author

Thanks @adoroszlai for the review and fixing the title!

@nandakumar131 nandakumar131 deleted the HDDS-12006 branch January 4, 2025 10:00
Comment on lines 168 to +174
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-proto</artifactId>
</dependency>

<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-server</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

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

For future patches: I think we can remove empty lines in dependencies section. Especially where the items before/after the empty line are from the same group.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the catch. I missed this while reviewing the output.

Especially where the items before/after the empty line are from the same group.

We can always remove the empty lines to make it consistent.

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