Merge pull request #20794 from JasonFengJ9/jdk25v1

JDK25 bring up
eclipse-openj9 · Dec 10, 2024 · fb68e57 · fb68e57
2 parents db18829 + 4f66f22
commit fb68e57
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 5 deletions.
diff --git 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">
 		<classpathentry kind="src" path="src/java.base/share/classes"/>
 		<classpathentry kind="src" path="src/java.management/share/classes"/>
 		<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
@@ -217,7 +217,7 @@
 		  label="JAVA24"
 		  outputpath="JAVA24/src"
 		  dependencies="JAVA23"
-		  jdkcompliance="22">
+		  jdkcompliance="23">
 		<classpathentry kind="src" path="src/java.base/share/classes"/>
 		<classpathentry kind="src" path="src/java.management/share/classes"/>
 		<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
@@ -241,6 +241,34 @@
 		<parameter name="jxerules:outputdir" value="java/lang"/>
 	</configuration>
 
+	<configuration
+		  label="JAVA25"
+		  outputpath="JAVA25/src"
+		  dependencies="JAVA24"
+		  jdkcompliance="23">
+		<classpathentry kind="src" path="src/java.base/share/classes"/>
+		<classpathentry kind="src" path="src/java.management/share/classes"/>
+		<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
+		<classpathentry kind="src" path="src/jdk.jcmd/share/classes"/>
+		<classpathentry kind="src" path="src/jdk.management/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.criu/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.dataaccess/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.dtfj/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.dtfjview/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.gpu/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.sharedclasses/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.traceformat/share/classes"/>
+		<classpathentry kind="src" path="src/openj9.zosconditionhandling/share/classes"/>
+		<classpathentry kind="lib" path="/binaries/common/ibm/ibmjzos.jar"/>
+		<classpathentry kind="lib" path="/binaries/vm/third/rt-compressed.sunJava24.jar"/>
+		<source path="src"/>
+		<parameter name="macro:define" value="JAVA_SPEC_VERSION=25"/>
+		<parameter name="msg:outputdir" value="java.base/share/classes/com/ibm/oti/util"/>
+		<parameter name="jxerules:outputdir" value="java/lang"/>
+	</configuration>
+
 	<configuration
 		  label="OPENJ9-RAWBUILD"
 		  outputpath="OPENJ9-RAWBUILD/src"

diff --git a/jcl/src/java.base/share/classes/java/lang/Class.java b/jcl/src/java.base/share/classes/java/lang/Class.java
@@ -5913,6 +5913,7 @@ public Class<?>[] 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
@@ -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
@@ -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/.../resources/excludes/latest_exclude_22.txt → .../resources/excludes/latest_exclude_25.txt b/.../resources/excludes/latest_exclude_22.txt → .../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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <!--
-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/...sts/jvmtitests/jvmtitests_excludes_22.xml → ...sts/jvmtitests/jvmtitests_excludes_25.xml b/...sts/jvmtitests/jvmtitests_excludes_22.xml → ...sts/jvmtitests/jvmtitests_excludes_25.xml