Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.

JDK-8259732: JDK 16 L10n resource file update - msg drop 10 #123

Closed
wants to merge 3 commits into from

Conversation

leohacker
Copy link
Member

@leohacker leohacker commented Jan 14, 2021

This is the changes for JDK 16 msg drop 10.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8259732: JDK 16 L10n resource file update - msg drop 10

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk16 pull/123/head:pull/123
$ git checkout pull/123

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 14, 2021

👋 Welcome back ljiang! 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 openjdk bot added the rfr Pull request is ready for review label Jan 14, 2021
@openjdk
Copy link

openjdk bot commented Jan 14, 2021

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

  • compiler
  • core-libs
  • javadoc
  • kulla
  • security
  • swing

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 javadoc javadoc-dev@openjdk.java.net swing swing-dev@openjdk.java.net security security-dev@openjdk.java.net core-libs core-libs-dev@openjdk.java.net compiler compiler-dev@openjdk.java.net kulla kulla-dev@openjdk.java.net labels Jan 14, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 14, 2021

Webrevs

@leohacker
Copy link
Member Author

leohacker commented Jan 14, 2021

Since they're Unicode escape sequences in the l10n resource files, so I attached a human readable webrev, created by git webrev and converted. Pls find this to help your review.
webrev.tar.gz

or review the changes from openjdk cr.
http://cr.openjdk.java.net/~ljiang/8259732/webrev.00/

@leohacker
Copy link
Member Author

@naotoj Would you have time to take a look at this change? Very appreciated!

It may be removed in a future release.
Copy link
Member

Choose a reason for hiding this comment

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

I believe this is to fix no newline at the end (unrelated to l10n changes). Do we need to change the copyright year for this?

Copy link
Member Author

@leohacker leohacker Jan 15, 2021

Choose a reason for hiding this comment

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

Actually I was correcting the L217, changed {) -> {}. But 2 days ago, Jonathan Gibbons fixed it in another commit 6bb6093. I found his fix after running the merge. Looks both of us forgot to update the copyright year. Any suggestion?

doclet.help.systemProperties.body=\
    The {0} page lists references to system properties.

Copy link
Member

Choose a reason for hiding this comment

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

I believe your PR still contains the fix to add the newline at the end of the file (at L518). So I think you can simply change the copyright year in standard.properties file.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thx! Fixed the copyright year for this file.

@openjdk
Copy link

openjdk bot commented Jan 19, 2021

@leohacker 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:

8259732: JDK 16 L10n resource file update - msg drop 10

Reviewed-by: naoto

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 6 new commits pushed to the master branch:

  • bb0821e: 8258643: [TESTBUG] javax/swing/JComponent/7154030/bug7154030.java failed with "Exception: Failed to hide opaque button"
  • cd25bf2: 8259574: SIGSEGV in BFSClosure::closure_impl
  • d5ca3b3: 8259641: C2: assert(early->dominates(LCA)) failed: early is high enough
  • e85892b: 8258396: SIGILL in jdk.jfr.internal.PlatformRecorder.rotateDisk()
  • 4307fa6: 8253505: JFR: onFlush invoked out of order with a sorted event stream
  • 0148adf: 8255120: C2: assert(outer->outcnt() >= phis + 2 && outer->outcnt() <= phis + 2 + stores + 1) failed: only phis

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 added the ready Pull request is ready to be integrated label Jan 19, 2021
@leohacker
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this Jan 20, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 20, 2021
@openjdk
Copy link

openjdk bot commented Jan 20, 2021

@leohacker Since your change was applied there have been 7 commits pushed to the master branch:

  • f7b96d3: 8259796: timed CompletableFuture.get may swallow InterruptedException
  • bb0821e: 8258643: [TESTBUG] javax/swing/JComponent/7154030/bug7154030.java failed with "Exception: Failed to hide opaque button"
  • cd25bf2: 8259574: SIGSEGV in BFSClosure::closure_impl
  • d5ca3b3: 8259641: C2: assert(early->dominates(LCA)) failed: early is high enough
  • e85892b: 8258396: SIGILL in jdk.jfr.internal.PlatformRecorder.rotateDisk()
  • 4307fa6: 8253505: JFR: onFlush invoked out of order with a sorted event stream
  • 0148adf: 8255120: C2: assert(outer->outcnt() >= phis + 2 && outer->outcnt() <= phis + 2 + stores + 1) failed: only phis

Your commit was automatically rebased without conflicts.

Pushed as commit 0120510.

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

@leohacker leohacker deleted the msgdrop branch January 25, 2021 06:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
compiler compiler-dev@openjdk.java.net core-libs core-libs-dev@openjdk.java.net integrated Pull request has been integrated javadoc javadoc-dev@openjdk.java.net kulla kulla-dev@openjdk.java.net security security-dev@openjdk.java.net swing swing-dev@openjdk.java.net
2 participants