8355522: Remove the `java.locale.useOldISOCodes` system property #26419

naotoj · 2025-07-21T22:56:50Z

This PR removes the system property deprecated in JDK 25. If the property is specified at runtime, a warning will be emitted at startup to inform the user that the value is ignored. A corresponding CSR has been drafted as well

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-8362953 to be approved

Issues

JDK-8355522: Remove the java.locale.useOldISOCodes system property (Bug - P4)
JDK-8362953: Remove the java.locale.useOldISOCodes system property (CSR)

Reviewers

Justin Lu (@justin-curtis-lu - Reviewer)
Joe Wang (@JoeWang-Java - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26419

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-07-21T22:57:34Z

👋 Welcome back naoto! 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 · 2025-07-21T22:58:19Z

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

8355522: Remove the `java.locale.useOldISOCodes` system property

Reviewed-by: jlu, joehw

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

c9ab330: 8373116: Genshen: arraycopy_work should be always done for arrays in old gen during young concurrent marking
3ea82b9: 8373272: Genshen: ShenandoahOldGenerationTest fails after JDK-8373056
b1c9550: 8372554: Test windows-x64-cmp-baseline failed due to differences with splashscreen object file
... and 5 more: https://git.openjdk.org/jdk/compare/811591c5c332e6427dc96819451e046841fe635b...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 · 2025-07-21T22:59:07Z

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

core-libs
i18n

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.

mlbridge · 2025-07-21T23:02:19Z

Webrevs

justin-curtis-lu

Should we also remove the test method, ModuleTestUtil.runModuleWithLegacyCode which passes the now defunct property to the process.

justin-curtis-lu · 2025-07-22T20:59:09Z

test/jdk/java/util/Locale/UseOldISOCodesTest.java

-            // Ensure java.locale.useOldISOCodes is only interpreted at runtime startup
-            // Should have no effect
+            // Ensure java.locale.useOldISOCodes should have no effect
            System.setProperty("java.locale.useOldISOCodes", "false");


IMO, it seems weird to keep this line in the test, even if it has no effect. The original goal was to ensure the property only had impact when set during startup. The current test is no longer concerned with that (since the property no longer performs any mapping).

Right. I re-purposed the test but as you mentioned, the line is confusing. Removed.

naotoj · 2025-07-22T22:04:32Z

Should we also remove the test method, ModuleTestUtil.runModuleWithLegacyCode which passes the now defunct property to the process.

I thought about that, but decided to leave it as it is, just to make sure everything works as before. For the same reason, I did not remove the -Djava.locale.useOldISOCodes=true run in LocaleTest.java

justin-curtis-lu · 2025-07-22T22:09:40Z

src/java.base/share/classes/sun/util/locale/BaseLocale.java

                variant.intern()));
    }

    public static String convertOldISOCodes(String language) {


It was there before this change, but above on line 166 I think we should update the outdated comment,

// JDK uses deprecated ISO639.1 language codes for he, yi and id

justin-curtis-lu

LGTM

justin-curtis-lu · 2025-07-23T16:48:13Z

src/java.base/share/classes/java/util/Locale.java

 * <p>Locale's constructors have always converted three language codes to
 * their earlier, obsoleted forms: {@code he} maps to {@code iw},
 * {@code yi} maps to {@code ji}, and {@code id} maps to
 * {@code in}. Since Java SE 17, this is no longer the case. Each


* <p>Locale's constructors have always converted three language codes to * their earlier, obsoleted forms: {@code he} maps to {@code iw}, * {@code yi} maps to {@code ji}, and {@code id} maps to * {@code in}. Since Java SE 17, this is no longer the case.

This history was relevant when the property existed. Since this is no longer the case, and we're quite a few releases away from 17, can we also remove this wording as well. Users on 26 should only be concerned with the "old" to "modern" mapping.

Good point. Modified the unnecesarry history.

bridgekeeper · 2025-08-21T02:31:26Z

@naotoj This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

naotoj · 2025-08-21T16:27:52Z

/keepalive

openjdk · 2025-08-21T16:29:08Z

@naotoj The pull request is being re-evaluated and the inactivity timeout has been reset.

bridgekeeper · 2025-09-19T02:50:01Z

@naotoj This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

bridgekeeper · 2025-10-18T00:14:18Z

@naotoj This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

naotoj · 2025-10-20T15:08:01Z

This PR is intended for JDK27. Will reopen it when the time comes

naotoj · 2025-12-08T17:42:45Z

/open

openjdk · 2025-12-08T17:43:34Z

@naotoj This pull request is now open

justin-curtis-lu

Now that PR is open again, did another take and looks good as before. Minor test comments.

justin-curtis-lu · 2025-12-08T17:51:46Z

test/jdk/java/util/Locale/LocaleTest.java

Since we are using JUnit, these assertions would be cleaner as assertEquals.

In this test file, there are other locations that use fail. Although it would be preferred to replace them with assertEquals, probably better be cleaned up with a separate issue.

justin-curtis-lu · 2025-12-08T17:57:22Z

test/jdk/java/util/Locale/LocaleTest.java

Here and below, I think these errors should be including the old language in the fail message, not the new language. i.e. hebrewOld.getLanguage instead of hebrewNew.getLanguage.

src/java.base/share/classes/sun/util/locale/BaseLocale.java

Co-authored-by: Andrey Turbanov <turbanoff@gmail.com>

naotoj · 2025-12-09T18:20:15Z

Thanks for the reviews!
/integrate

openjdk · 2025-12-09T18:21:16Z

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

b99be50: 8368524: Tests are skipped and shown as passed in test/jdk/sun/security/pkcs11/Cipher/KeyWrap
831fe94: 8373255: Unexpected iobj and ipdb files after JDK-8370438
8c8d21d: 8373295: Wrong log tag for UseCompressedOops ergo setting
... and 19 more: https://git.openjdk.org/jdk/compare/811591c5c332e6427dc96819451e046841fe635b...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-12-09T18:21:30Z

@naotoj Pushed as commit b2daf9d.

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

initial commit

85d8adf

openjdk bot added csr Pull request needs approved CSR before integration rfr Pull request is ready for review labels Jul 21, 2025

openjdk bot added core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org labels Jul 21, 2025

justin-curtis-lu reviewed Jul 22, 2025

View reviewed changes

Reflects review comments

bcfd8a7

justin-curtis-lu reviewed Jul 22, 2025

View reviewed changes

Obsolete comment correction

93f3a8b

justin-curtis-lu approved these changes Jul 22, 2025

View reviewed changes

graalvmbot mentioned this pull request Jul 23, 2025

[JDK-8363432] Adapt JDK-8355522: Remove the java.locale.useOldISOCodes system property oracle/graal#11748

Open

JoeWang-Java approved these changes Jul 23, 2025

View reviewed changes

justin-curtis-lu reviewed Jul 23, 2025

View reviewed changes

Further wording refinement

c68a63b

JoeWang-Java approved these changes Sep 19, 2025

View reviewed changes

bridgekeeper bot closed this Oct 18, 2025

openjdk bot reopened this Dec 8, 2025

Merge branch 'master' into JDK-8355522-Remove-useOldISOCodes

c3045b5

justin-curtis-lu reviewed Dec 8, 2025

View reviewed changes

Reflects review comments

965830a

turbanoff reviewed Dec 8, 2025

View reviewed changes

src/java.base/share/classes/sun/util/locale/BaseLocale.java Outdated Show resolved Hide resolved

Apply suggestions from code review

c427e18

Co-authored-by: Andrey Turbanov <turbanoff@gmail.com>

justin-curtis-lu approved these changes Dec 8, 2025

View reviewed changes

JoeWang-Java approved these changes Dec 9, 2025

View reviewed changes

openjdk bot added ready Pull request is ready to be integrated and removed csr Pull request needs approved CSR before integration labels Dec 9, 2025

openjdk bot added the integrated Pull request has been integrated label Dec 9, 2025

openjdk bot closed this Dec 9, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 9, 2025

8355522: Remove the java.locale.useOldISOCodes system property #26419

8355522: Remove the java.locale.useOldISOCodes system property #26419

Uh oh!

Conversation

naotoj commented Jul 21, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issues

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Jul 21, 2025

Uh oh!

openjdk bot commented Jul 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Jul 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mlbridge bot commented Jul 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

justin-curtis-lu left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

naotoj commented Jul 22, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

justin-curtis-lu left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bridgekeeper bot commented Aug 21, 2025

Uh oh!

naotoj commented Aug 21, 2025

Uh oh!

openjdk bot commented Aug 21, 2025

Uh oh!

bridgekeeper bot commented Sep 19, 2025

Uh oh!

bridgekeeper bot commented Oct 18, 2025

Uh oh!

naotoj commented Oct 20, 2025

Uh oh!

naotoj commented Dec 8, 2025

Uh oh!

openjdk bot commented Dec 8, 2025

Uh oh!

justin-curtis-lu left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

naotoj commented Dec 9, 2025

Uh oh!

openjdk bot commented Dec 9, 2025

Uh oh!

openjdk bot commented Dec 9, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

8355522: Remove the `java.locale.useOldISOCodes` system property #26419

8355522: Remove the `java.locale.useOldISOCodes` system property #26419

naotoj commented Jul 21, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Jul 21, 2025 •

edited

Loading

openjdk bot commented Jul 21, 2025 •

edited

Loading

mlbridge bot commented Jul 21, 2025 •

edited

Loading