Skip to content

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

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: galahad
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afdf0ac
Adapt JDK-8355522: Remove the `java.locale.useOldISOCodes` system pro…
mur47x111 Jul 22, 2025
2e9eab6
Update galahad jdk
mur47x111 Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
"jdks": {
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+7-655", "platformspecific": true, "extrabundles": ["static-libs"]},
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+7-xxx", "platformspecific": true, "extrabundles": ["static-libs"]},

"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
Expand Down
13 changes: 1 addition & 12 deletions ....oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -112,10 +112,6 @@ final class Target_jdk_internal_util_StaticProperty {
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
private static String SUN_JNU_ENCODING;

@Alias//
@RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
private static String JAVA_LOCALE_USE_OLD_ISO_CODES;

@Delete//
private static String OS_NAME;

Expand Down Expand Up @@ -210,7 +206,6 @@ final class Target_jdk_internal_util_StaticProperty {
STDOUT_ENCODING = p.getInitialProperty("stdout.encoding");

SUN_JNU_ENCODING = p.getInitialProperty("sun.jnu.encoding");
JAVA_LOCALE_USE_OLD_ISO_CODES = p.getInitialProperty("java.locale.useOldISOCodes", "");

OS_ARCH = p.getInitialProperty("os.arch");

Expand Down Expand Up @@ -337,12 +332,6 @@ public static String jnuEncoding() {
return SUN_JNU_ENCODING;
}

@Substitute
public static String javaLocaleUseOldISOCodes() {
assert Objects.equals(JAVA_LOCALE_USE_OLD_ISO_CODES, SystemPropertiesSupport.singleton().getInitialProperty("java.locale.useOldISOCodes", ""));
return JAVA_LOCALE_USE_OLD_ISO_CODES;
}

@Substitute
public static String osName() {
return SystemPropertiesSupport.singleton().getInitialProperty("os.name");
Expand Down