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

8301119: Support for GB18030-2022 #1897

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented May 24, 2023

This is the companion implementation change for the recent specification changes which allowed for the additional characters required to support GB18030-2022.

The following modifications were necessary for 11u:

  • Manual copyright header changes in GB18030.java, StandardCharsets.java.template and ExtendedCharsets.java.template. 11u is missing JDK-8229960 ("Remove sun.nio.cs.map system property") and, as with 17, JDK-8260265: "UTF-8 by Default", a JEP added in OpenJDK 18
  • Manual import statement changes in ExtendedCharsets.java.template (SoftReference was also unused, removed by JDK-8229960 in 17u)
  • Conversion of the switch statements to the old style in GB18030.java (no Switch Expressions, JEP-361 in OpenJDK 14)
  • We retain stdcs-solaris and make the same alteration to remove GB18030 as in stdcs-aix, stdcs-linux and stdcs-windows. The Solaris port was not removed until OpenJDK 15 and this file seems to have been overlooked in that removal, until this change.

Tests in jdk/java/nio/charset and jdk/sun/nio/cs all passed after patching.


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
  • Change requires CSR request JDK-8301559 to be approved

Issues

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1897

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 24, 2023

👋 Welcome back andrew! 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 changed the title Backport a253b4602147633a3d2e83775d1feef4f12a5272 8301119: Support for GB18030-2022 May 24, 2023
@openjdk
Copy link

openjdk bot commented May 24, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels May 24, 2023
@mlbridge
Copy link

mlbridge bot commented May 24, 2023

Webrevs

Copy link
Contributor

@jerboaa jerboaa 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 good to me. Thanks!

@openjdk
Copy link

openjdk bot commented May 25, 2023

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

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

8301119: Support for GB18030-2022

Reviewed-by: sgehwolf

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

  • 5fa213a: 8287246: DSAKeyValue should check for missing params instead of relying on KeyFactory provider
  • c0ae141: 8275735: [linux] Remove deprecated Metrics api (kernel memory limit)

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 May 25, 2023
@gnu-andrew
Copy link
Member Author

Thanks. Flagged with jdk11u-fix-request.

@gnu-andrew
Copy link
Member Author

I see jdk11u-fix-yes
/integrate

@openjdk
Copy link

openjdk bot commented May 26, 2023

Going to push as commit 5c4e744.
Since your change was applied there have been 4 commits pushed to the master branch:

  • 682728e: 8275233: Incorrect line number reported in exception stack trace thrown from a lambda expression
  • 2e01473: 8278434: timeouts in test java/time/test/java/time/format/TestZoneTextPrinterParser.java
  • 5fa213a: 8287246: DSAKeyValue should check for missing params instead of relying on KeyFactory provider
  • c0ae141: 8275735: [linux] Remove deprecated Metrics api (kernel memory limit)

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 26, 2023

@gnu-andrew Pushed as commit 5c4e744.

💡 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 integrated Pull request has been integrated
3 participants