diff --git a/jcl/jpp_configuration.xml b/jcl/jpp_configuration.xml
index 8dd1ea16420..e5a6f664c9d 100644
--- a/jcl/jpp_configuration.xml
+++ b/jcl/jpp_configuration.xml
@@ -189,7 +189,7 @@
label="JAVA23"
outputpath="JAVA23/src"
dependencies="JAVA21"
- jdkcompliance="22">
+ jdkcompliance="23">
@@ -217,7 +217,7 @@
label="JAVA24"
outputpath="JAVA24/src"
dependencies="JAVA23"
- jdkcompliance="22">
+ jdkcompliance="23">
@@ -241,6 +241,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[] getPermittedSubclasses()
getUnsafe().putObjectRelease(this, localPermittedSubclassesCacheOffset, localPermittedSubclasses);
}
+ /*[IF JAVA_SPEC_VERSION < 24]*/
@SuppressWarnings("removal")
SecurityManager sm = System.getSecurityManager();
if (null != sm) {
@@ -5931,6 +5932,7 @@ public Class[] getPermittedSubclasses()
sm.checkPackageAccess(pkgName);
}
}
+ /*[ENDIF] JAVA_SPEC_VERSION < 24 */
return localPermittedSubclasses;
}
diff --git a/jcl/src/java.base/share/classes/java/lang/J9VMInternals.java b/jcl/src/java.base/share/classes/java/lang/J9VMInternals.java
index 4aaa989e6ec..52425672ec1 100644
--- a/jcl/src/java.base/share/classes/java/lang/J9VMInternals.java
+++ b/jcl/src/java.base/share/classes/java/lang/J9VMInternals.java
@@ -386,7 +386,8 @@ private static void threadCleanup(Thread thread) {
}
/*[PR CVMC 124584] checkPackageAccess(), not defineClassImpl(), should use ProtectionDomain */
- private static void checkPackageAccess(final Class clazz, ProtectionDomain pd) {
+ private static void checkPackageAccess(final Class clazz, ProtectionDomain pd) {
+ /*[IF JAVA_SPEC_VERSION < 24]*/
@SuppressWarnings("removal")
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
@@ -407,6 +408,7 @@ public Object run() {
}
}, new AccessControlContext(pdArray));
}
+ /*[ENDIF] JAVA_SPEC_VERSION < 24 */
}
/*[PR CMVC 104341] Exceptions in Object.finalize() not ignored */
diff --git a/test/TestConfig/resources/excludes/latest_exclude_24.txt b/test/TestConfig/resources/excludes/latest_exclude_24.txt
index d62ca4e4876..8d3b462d32e 100644
--- a/test/TestConfig/resources/excludes/latest_exclude_24.txt
+++ b/test/TestConfig/resources/excludes/latest_exclude_24.txt
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright IBM Corp. and others 2024
+# Copyright IBM Corp. and others 2023
#
# This program and the accompanying materials are made available under
# the terms of the Eclipse Public License 2.0 which accompanies this
diff --git a/test/TestConfig/resources/excludes/latest_exclude_22.txt b/test/TestConfig/resources/excludes/latest_exclude_25.txt
similarity index 100%
rename from test/TestConfig/resources/excludes/latest_exclude_22.txt
rename to test/TestConfig/resources/excludes/latest_exclude_25.txt
diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_24.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_24.xml
index 20de1f7b4bb..ebc191a9fe3 100644
--- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_24.xml
+++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_24.xml
@@ -1,6 +1,6 @@