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

8346232: Remove leftovers of the jar --normalize feature #22751

Closed
wants to merge 1 commit into from

Conversation

eirbjo
Copy link
Contributor

@eirbjo eirbjo commented Dec 14, 2024

Please review this cleanup PR which removes a property and a code comment left behind after the jar --normalize feature was removed in JDK 14.

The feature was deprecated in JDK-8199871 and removed in JDK-8234542, along with removal of Pack200 tools and APIs.

This PR removes the now unused main.help.opt.create.normalize property and a code comment in Main.java referencing normalization.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8346232: Remove leftovers of the jar --normalize feature (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22751/head:pull/22751
$ git checkout pull/22751

Update a local copy of the PR:
$ git checkout pull/22751
$ git pull https://git.openjdk.org/jdk.git pull/22751/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22751

View PR using the GUI difftool:
$ git pr show -t 22751

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22751.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 14, 2024

👋 Welcome back eirbjo! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Dec 14, 2024

@eirbjo This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8346232: Remove leftovers of the jar --normalize feature

Reviewed-by: alanb, jpai

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 83 new commits pushed to the master branch:

  • dbffe33: 8345263: Make sure that lint categories are used correctly when logging lint warnings
  • 32c8195: 8345801: C2: Clean up include statements to speed up compilation when touching type.hpp
  • 9286018: 8345322: RISC-V: Add concurrent gtests for cmpxchg variants
  • 4fc43b0: 8345770: javadoc: API documentation builds are not always reproducible
  • ee1c5ad: 8345975: Update SAP SE copyright year to 2024 where it was missed
  • 3518b4b: 8344171: Clone and initialize Assertion Predicates in order instead of in reverse-order
  • c88e081: 8346160: Fix -Wzero-as-null-pointer-constant warnings from explicit casts
  • ab1dbd4: 8346202: Correct typo in SQLPermission
  • 6b022bb: 8344453: Test jdk/jfr/event/oldobject/TestSanityDefault.java timed out
  • 3b9de11: 8319875: Add macOS implementation for jcmd System.map
  • ... and 73 more: https://git.openjdk.org/jdk/compare/165fd848c133e3281a13d55da77faa0641586b54...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title JDK-8346232: Remove leftovers of the jar --normalize feature 8346232: Remove leftovers of the jar --normalize feature Dec 14, 2024
@openjdk
Copy link

openjdk bot commented Dec 14, 2024

@eirbjo The following labels will be automatically applied to this pull request:

  • compiler
  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels Dec 14, 2024
@eirbjo eirbjo marked this pull request as ready for review December 14, 2024 12:53
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 14, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 14, 2024

Webrevs

main.help.opt.create.normalize=\
\ -n, --normalize Normalize information in the new jar archive\n\
\ after creation. This option is deprecated, and is\n\
\ planned for removal in a future JDK release
Copy link
Contributor

Choose a reason for hiding this comment

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

It does appear to be leftover from when the pack200 and the -n option were removed.

We don't usually touch the translated resources. Oracle updates the translations near the end of each release for the languages supported by Oracle JDK but there are a few translations that are probably out of date now. For removal then it's probably okay.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We don't usually touch the translated resources. [...] For removal then it's probably okay.

What's your recommendation here? Happy to revert changes to translated files, keeping the delete in jar.properties, if so desirable.

This would rely on Oracle's translation update process catching the remval and update it, ideally in all translations, not only those supported by Oracle JDK, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

What's your recommendation here? Happy to revert changes to translated files, keeping the delete in jar.properties, if so desirable.

This would rely on Oracle's translation update process catching the remval and update it, ideally in all translations, not only those supported by Oracle JDK, right?

I think what you have is okay, I'm just saying that we don't usually touch translations when making changes.

Oracle does a refresh the de, ja, and zh_CN translations in each release so I assume the lines you removed will get removed by the next update anyway. @justin-curtis-lu knows more about this "process". I don't know if anyone funds or maintains the other translations now, it's possible that some of these have bit rotted in recent years.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, removing them is fine here. Otherwise we would have caught them during the L10n update anyways.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 16, 2024
Copy link
Member

@jaikiran jaikiran left a comment

Choose a reason for hiding this comment

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

This looks fine to me.

@eirbjo
Copy link
Contributor Author

eirbjo commented Dec 16, 2024

Thanks for Alan and Jaikiran for reviews and to Justin for the L10n clarification.

/integrate

@openjdk
Copy link

openjdk bot commented Dec 16, 2024

Going to push as commit 51662c2.
Since your change was applied there have been 92 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 16, 2024
@openjdk openjdk bot closed this Dec 16, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 16, 2024
@openjdk
Copy link

openjdk bot commented Dec 16, 2024

@eirbjo Pushed as commit 51662c2.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants