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

8332174: Remove 2 (unpaired) RLO Unicode characters in ff_Adlm.xml #2625

Conversation

fitzsim
Copy link
Contributor

@fitzsim fitzsim commented Jun 21, 2024

I would like to backport the fix for 8332174 from 21u to 17u. Skara
was able to apply the patch without alteration:

$ git skara backport --from https://github.com/openjdk/jdk21u-dev d5363bc509d4996529420b453a99e982c843da1c
Fetching ...
Cherry picking ...
Performing inexact rename detection: 100% (7376712/7376712), done.
Auto-merging make/data/cldr/common/main/ff_Adlm.xml
Committing ...
Commit d5363bc509d4996529420b453a99e982c843da1c successfully backported as commit 859f60badb2c034ad6361fba1ab1ac128b828029

Progress

  • JDK-8332174 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8332174: Remove 2 (unpaired) RLO Unicode characters in ff_Adlm.xml (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2625/head:pull/2625
$ git checkout pull/2625

Update a local copy of the PR:
$ git checkout pull/2625
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2625/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2625

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2625.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2024

👋 Welcome back fitzsim! 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 Jun 21, 2024

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

8332174: Remove 2 (unpaired) RLO Unicode characters in ff_Adlm.xml

Reviewed-by: andrew

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

  • a963e2d: 8241550: [macOS] SSLSocketImpl/ReuseAddr.java failed due to "BindException: Address already in use"
  • 0c0871d: 8316389: Open source few AWT applet tests
  • 35cac7f: 8301704: Shorten the number of GCs in UnloadingTest.java to verify a class loader not being unloaded
  • b09c9eb: 8333398: Uncomment the commented test in test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
  • c281c1c: 8328110: Allow simultaneous use of PassFailJFrame with split UI and additional windows
  • 1fe0bb4: 8325384: sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java failing intermittently when main thread is a virtual thread
  • c858b68: 8314476: TestJstatdPortAndServer.java failed with "java.rmi.NoSuchObjectException: no such object in table"
  • 8f5a9f7: 8324755: Enable parallelism in vmTestbase/gc/gctests/LargeObjects tests
  • ba3db30: 8319197: Exclude hb-subset and hb-style from compilation
  • e2de2b9: 8329663: hs_err file event log entry for thread adding/removing should print current thread
  • ... and 18 more: https://git.openjdk.org/jdk17u-dev/compare/33dbf71b8702bdae953bfca7aa6e5832c73d6445...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@gnu-andrew) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport d5363bc509d4996529420b453a99e982c843da1c 8332174: Remove 2 (unpaired) RLO Unicode characters in ff_Adlm.xml Jun 21, 2024
@openjdk
Copy link

openjdk bot commented Jun 21, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Jun 21, 2024

⚠️ @fitzsim This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 21, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 21, 2024

Webrevs

@fitzsim
Copy link
Contributor Author

fitzsim commented Jun 21, 2024

/approval request "The tests are still running but I do not expect any failures, so requesting approval now."

@openjdk
Copy link

openjdk bot commented Jun 21, 2024

@fitzsim
8332174: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 21, 2024
Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Confirmed this matches the 21u version.

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Jun 25, 2024

@gnu-andrew
8332174: The approval request has been approved.

@fitzsim
Copy link
Contributor Author

fitzsim commented Jun 25, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 25, 2024
@openjdk
Copy link

openjdk bot commented Jun 25, 2024

@fitzsim
Your change (at version 859f60b) is now ready to be sponsored by a Committer.

@TheRealMDoerr
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 26, 2024

Going to push as commit 859dda1.
Since your change was applied there have been 28 commits pushed to the master branch:

  • a963e2d: 8241550: [macOS] SSLSocketImpl/ReuseAddr.java failed due to "BindException: Address already in use"
  • 0c0871d: 8316389: Open source few AWT applet tests
  • 35cac7f: 8301704: Shorten the number of GCs in UnloadingTest.java to verify a class loader not being unloaded
  • b09c9eb: 8333398: Uncomment the commented test in test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
  • c281c1c: 8328110: Allow simultaneous use of PassFailJFrame with split UI and additional windows
  • 1fe0bb4: 8325384: sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java failing intermittently when main thread is a virtual thread
  • c858b68: 8314476: TestJstatdPortAndServer.java failed with "java.rmi.NoSuchObjectException: no such object in table"
  • 8f5a9f7: 8324755: Enable parallelism in vmTestbase/gc/gctests/LargeObjects tests
  • ba3db30: 8319197: Exclude hb-subset and hb-style from compilation
  • e2de2b9: 8329663: hs_err file event log entry for thread adding/removing should print current thread
  • ... and 18 more: https://git.openjdk.org/jdk17u-dev/compare/33dbf71b8702bdae953bfca7aa6e5832c73d6445...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 26, 2024

@TheRealMDoerr @fitzsim Pushed as commit 859dda1.

💡 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
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants