From afdf0ac7cb91c0c8f46d0d4c8b3015653b1fdb45 Mon Sep 17 00:00:00 2001 From: Yudi Zheng Date: Tue, 22 Jul 2025 14:26:31 +0200 Subject: [PATCH 1/2] Adapt JDK-8355522: Remove the `java.locale.useOldISOCodes` system property --- .../Target_jdk_internal_util_StaticProperty.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java index 4b3db5f051e5..268d40fd4099 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java @@ -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 @@ -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; @@ -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"); @@ -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"); From 2e9eab6a044fbaa735082106b6d93bf98152e51e Mon Sep 17 00:00:00 2001 From: Yudi Zheng Date: Tue, 22 Jul 2025 14:26:46 +0200 Subject: [PATCH 2/2] Update galahad jdk --- common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.json b/common.json index 86497d63f4be..e2c3887f2f00 100644 --- a/common.json +++ b/common.json @@ -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 },