GH-483 JDK 20-ea support added

thurka · thurka · commit e1d56b9f23a5 · 2023-01-27T11:53:48.000+01:00
diff --git a/visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/JvmJvmstatModelProvider.java b/visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/JvmJvmstatModelProvider.java
@@ -80,6 +80,8 @@ public JvmJvmstatModel createModelFor(Application app) {
                 else if (isJavaVersion(javaVersion,"18")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
                 // JVM 19
                 else if (isJavaVersion(javaVersion,"19")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
+                // JVM 20
+                else if (isJavaVersion(javaVersion,"20")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
             }
             
             if (model == null) {
diff --git a/visualvm/libs.profiler/lib.profiler.common/manifest.mf b/visualvm/libs.profiler/lib.profiler.common/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualvm.lib.common/2
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/common/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.6
+OpenIDE-Module-Specification-Version: 2.7
 OpenIDE-Module-Needs: org.graalvm.visualvm.lib.common.Profiler
 
diff --git a/visualvm/libs.profiler/lib.profiler.common/nbproject/project.xml b/visualvm/libs.profiler/lib.profiler.common/nbproject/project.xml
@@ -36,7 +36,7 @@ questions.
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.12</specification-version>
+                        <specification-version>2.13</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/Bundle.properties b/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/Bundle.properties
@@ -37,6 +37,7 @@ IntegrationUtils_PlatformJava160=Java SE 16
 IntegrationUtils_PlatformJava170=Java SE 17
 IntegrationUtils_PlatformJava180=Java SE 18
 IntegrationUtils_PlatformJava190=Java SE 19
+IntegrationUtils_PlatformJava200=Java SE 20
 IntegrationUtils_PlatformJavaCvm=CVM
 IntegrationUtils_PlatformWindowsOs=Windows, 32bit JVM
 IntegrationUtils_PlatformWindowsAmd64Os=Windows, 64bit JVM
@@ -81,6 +82,7 @@ IntegrationUtils_Jdk160Name=Java SE 16 (JRE or JDK)
 IntegrationUtils_Jdk170Name=Java SE 17 (JRE or JDK)
 IntegrationUtils_Jdk180Name=Java SE 18 (JRE or JDK)
 IntegrationUtils_Jdk190Name=Java SE 19 (JRE or JDK)
+IntegrationUtils_Jdk200Name=Java SE 20 (JRE or JDK)
 IntegrationUtils_JdkCvmName=CVM
 IntegrationUtils_RemoteString=remote
 # HTML-formatted
diff --git a/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/IntegrationUtils.java b/visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/IntegrationUtils.java
@@ -64,6 +64,7 @@ public class IntegrationUtils {
     public static final String PLATFORM_JAVA_170 = messages.getString("IntegrationUtils_PlatformJava170"); // NOI18N
     public static final String PLATFORM_JAVA_180 = messages.getString("IntegrationUtils_PlatformJava180"); // NOI18N
     public static final String PLATFORM_JAVA_190 = messages.getString("IntegrationUtils_PlatformJava190"); // NOI18N
+    public static final String PLATFORM_JAVA_200 = messages.getString("IntegrationUtils_PlatformJava200"); // NOI18N
     public static final String PLATFORM_JAVA_CVM = messages.getString("IntegrationUtils_PlatformJavaCvm"); // NOI18N
     public static final String PLATFORM_WINDOWS_OS = messages.getString("IntegrationUtils_PlatformWindowsOs"); // NOI18N
     public static final String PLATFORM_WINDOWS_AMD64_OS = messages.getString("IntegrationUtils_PlatformWindowsAmd64Os"); // NOI18N
@@ -101,6 +102,7 @@ public class IntegrationUtils {
     private static final String JDK_170_NAME = messages.getString("IntegrationUtils_Jdk170Name"); // NOI18N
     private static final String JDK_180_NAME = messages.getString("IntegrationUtils_Jdk180Name"); // NOI18N
     private static final String JDK_190_NAME = messages.getString("IntegrationUtils_Jdk190Name"); // NOI18N
+    private static final String JDK_200_NAME = messages.getString("IntegrationUtils_Jdk200Name"); // NOI18N
     private static final String JDK_CVM_NAME = messages.getString("IntegrationUtils_JdkCvmName"); // NOI18N
     private static final String HTML_REMOTE_STRING = "&lt;" + messages.getString("IntegrationUtils_RemoteString") + "&gt;"; // NOI18N
     private static final String EXPORT_SETENV_MESSAGE = messages.getString("IntegrationUtils_ExportSetenvMessage"); // NOI18N
@@ -292,6 +294,8 @@ public static String getJavaPlatformFromJavaVersionString(String javaVersionStri
             return PLATFORM_JAVA_180;
         } else if (javaVersionString.equals(CommonConstants.JDK_190_STRING)) {
             return PLATFORM_JAVA_190;
+        } else if (javaVersionString.equals(CommonConstants.JDK_200_STRING)) {
+            return PLATFORM_JAVA_200;
         } else if (javaVersionString.equals(CommonConstants.JDK_CVM_STRING)) {
             return PLATFORM_JAVA_CVM;
         }
@@ -375,6 +379,8 @@ public static String getJavaPlatformName(String javaPlatform) {
             return JDK_180_NAME;
         } else if (javaPlatform.equals(PLATFORM_JAVA_190)) {
             return JDK_190_NAME;
+        } else if (javaPlatform.equals(PLATFORM_JAVA_200)) {
+            return JDK_200_NAME;
         } else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
             return JDK_CVM_NAME;
         }
@@ -414,6 +420,8 @@ public static String getJavaPlatformNativeLibrariesDirectoryName(String javaPlat
             return "jdk16"; //NOI18N // for JDK 18 we use the same as for 6.0 for now
         } else if (javaPlatform.equals(PLATFORM_JAVA_190)) {
             return "jdk16"; //NOI18N // for JDK 19 we use the same as for 6.0 for now
+        } else if (javaPlatform.equals(PLATFORM_JAVA_200)) {
+            return "jdk16"; //NOI18N // for JDK 20 we use the same as for 6.0 for now
         } else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
             return "cvm";  // NOI18N
         }
@@ -476,6 +484,8 @@ public static String getLocalJavaPlatform() {
             return PLATFORM_JAVA_180;
         } else if (jdkVersion == Platform.JDK_190) {
             return PLATFORM_JAVA_190;
+        } else if (jdkVersion == Platform.JDK_200) {
+            return PLATFORM_JAVA_200;
         }
 
         return null;
diff --git a/visualvm/libs.profiler/lib.profiler/manifest.mf b/visualvm/libs.profiler/lib.profiler/manifest.mf
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualvm.lib.jfluid/2
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/jfluid/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.12
+OpenIDE-Module-Specification-Version: 2.13
 
diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/CommonConstants.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/CommonConstants.java
@@ -90,6 +90,7 @@ public interface CommonConstants {
     public static final int JDK_170 = 15;
     public static final int JDK_180 = 16;
     public static final int JDK_190 = 17;
+    public static final int JDK_200 = 18;
     public static final int JDK_CVM = 5;
     public static final int JDK_UNSUPPORTED = -1;
 
@@ -109,6 +110,7 @@ public interface CommonConstants {
     public static final String JDK_170_STRING = "jdk170"; // NOI18N
     public static final String JDK_180_STRING = "jdk180"; // NOI18N
     public static final String JDK_190_STRING = "jdk190"; // NOI18N
+    public static final String JDK_200_STRING = "jdk200"; // NOI18N
     public static final String JDK_CVM_STRING = "cvm";  // NOI18N
     public static final String JDK_UNSUPPORTED_STRING = "UNSUPPORTED_JDK"; // NOI18N
 
diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/Platform.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/Platform.java
@@ -299,6 +299,8 @@ public static int getJDKVersionNumber(String javaVersion) {
             jdkVersion = JDK_180;
         } else if (isJavaVersion(javaVersion,"19")) { // NOI18N
             jdkVersion = JDK_190;
+        } else if (isJavaVersion(javaVersion,"20")) { // NOI18N
+            jdkVersion = JDK_200;
         } else if (javaVersion.equals("CVM")) { // NOI18N
             jdkVersion = JDK_CVM;
         } else {
@@ -349,6 +351,7 @@ public static String getJDKVersionString(String javaVersionString) {
             case JDK_170: return JDK_170_STRING;
             case JDK_180: return JDK_180_STRING;
             case JDK_190: return JDK_190_STRING;
+            case JDK_200: return JDK_200_STRING;
             case JDK_CVM: return JDK_CVM_STRING;
             case JDK_UNSUPPORTED: return JDK_UNSUPPORTED_STRING;
         }
diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/JavaClassConstants.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/JavaClassConstants.java
@@ -36,7 +36,7 @@ public interface JavaClassConstants {
 
     /* Class file constants */
     public static final int JAVA_MAGIC = 0xCAFEBABE;
-    public static final int JAVA_MAJOR_VERSION = 63;
+    public static final int JAVA_MAJOR_VERSION = 64;
     public static final int JAVA_MINOR_VERSION = 0;
     public static final int JAVA_MIN_MAJOR_VERSION = 45;
     public static final int JAVA_MIN_MINOR_VERSION = 3;
diff --git a/visualvm/libs.profiler/profiler.attach/nbproject/project.xml b/visualvm/libs.profiler/profiler.attach/nbproject/project.xml
@@ -36,7 +36,7 @@ questions.
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.6</specification-version>
+                        <specification-version>2.7</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/providers/TargetPlatformEnum.java b/visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/providers/TargetPlatformEnum.java
@@ -46,7 +46,8 @@ public class TargetPlatformEnum {
                                                  IntegrationUtils.PLATFORM_JAVA_130,IntegrationUtils.PLATFORM_JAVA_140,
                                                  IntegrationUtils.PLATFORM_JAVA_150,IntegrationUtils.PLATFORM_JAVA_160,
                                                  IntegrationUtils.PLATFORM_JAVA_170,IntegrationUtils.PLATFORM_JAVA_180,
-                                                 IntegrationUtils.PLATFORM_JAVA_190,IntegrationUtils.PLATFORM_JAVA_CVM,
+                                                 IntegrationUtils.PLATFORM_JAVA_190,IntegrationUtils.PLATFORM_JAVA_200,
+                                                 IntegrationUtils.PLATFORM_JAVA_CVM,
                                              };
     public static final TargetPlatformEnum JDK5 = new TargetPlatformEnum(0);
     public static final TargetPlatformEnum JDK6 = new TargetPlatformEnum(1);
@@ -63,7 +64,8 @@ public class TargetPlatformEnum {
     public static final TargetPlatformEnum JDK17 = new TargetPlatformEnum(12);
     public static final TargetPlatformEnum JDK18 = new TargetPlatformEnum(13);
     public static final TargetPlatformEnum JDK19 = new TargetPlatformEnum(14);
-    public static final TargetPlatformEnum JDK_CVM = new TargetPlatformEnum(15);
+    public static final TargetPlatformEnum JDK20 = new TargetPlatformEnum(15);
+    public static final TargetPlatformEnum JDK_CVM = new TargetPlatformEnum(16);
 
     //~ Instance fields ----------------------------------------------------------------------------------------------------------
 
@@ -91,7 +93,7 @@ public int hashCode() {
     }
 
     public static Iterator<TargetPlatformEnum> iterator() {
-        List<TargetPlatformEnum> jvmList = new ArrayList<>(16);
+        List<TargetPlatformEnum> jvmList = new ArrayList<>(17);
         jvmList.add(JDK5);
         jvmList.add(JDK6);
         jvmList.add(JDK7);
@@ -107,6 +109,7 @@ public static Iterator<TargetPlatformEnum> iterator() {
         jvmList.add(JDK17);
         jvmList.add(JDK18);
         jvmList.add(JDK19);
+        jvmList.add(JDK20);
         jvmList.add(JDK_CVM);
 
         return jvmList.listIterator();
diff --git a/visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/spi/AbstractRemotePackExporter.java b/visualvm/libs.profiler/profiler.attach/src/org/graalvm/visualvm/lib/profiler/attach/spi/AbstractRemotePackExporter.java
@@ -69,6 +69,7 @@ abstract public class AbstractRemotePackExporter {
             put(TargetPlatformEnum.JDK17.toString(), "15"); //NOI18N
             put(TargetPlatformEnum.JDK18.toString(), "15"); //NOI18N
             put(TargetPlatformEnum.JDK19.toString(), "15"); //NOI18N
+            put(TargetPlatformEnum.JDK20.toString(), "15"); //NOI18N
             put(TargetPlatformEnum.JDK_CVM.toString(), "cvm"); //NOI18N
         }
     };
diff --git a/visualvm/profiler/src/org/graalvm/visualvm/profiler/ProfilerSupport.java b/visualvm/profiler/src/org/graalvm/visualvm/profiler/ProfilerSupport.java
@@ -171,6 +171,8 @@ static String getJavaName(String code) {
             return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 18); // NOI18N
         if (Platform.JDK_190_STRING.equals(code))
             return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 19); // NOI18N
+        if (Platform.JDK_200_STRING.equals(code))
+            return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 20); // NOI18N
         throw new IllegalArgumentException("Unknown java code " + code); // NOI18N
     }
     
@@ -426,8 +428,8 @@ private List<String> getSupprtedJavaPlatformIds() {
             String code = "jdk1" + i; // NOI18N
             if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) codesl.add(code);
         }
-        // jdk 10 .. jdk 19
-        for (int i = 10; i <= 19; i++) {
+        // jdk 10 .. jdk 20
+        for (int i = 10; i <= 20; i++) {
             String code = "jdk" + i +"0"; // NOI18N
             if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) codesl.add(code);
         }
diff --git a/visualvm/startup/src/org/graalvm/visualvm/modules/startup/Bundle.properties b/visualvm/startup/src/org/graalvm/visualvm/modules/startup/Bundle.properties
@@ -53,7 +53,7 @@ ACSD_RejectButton=Click to reject license and exit
 OpenIDE-Module-Short-Description=VisualVM startup Module
 
 VisualVMStartup_ErrorStartupCaption=Error Starting VisualVM
-VisualVMStartup_IncorrectVersionMsg=<html><br><b>You are running VisualVM using an unsupported Java version: {0}.</b><br><br>Please use JDK 8 to JDK 19 to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {1}<br>JVM: {2}<br>Location: {3}</i><br><br></html>
+VisualVMStartup_IncorrectVersionMsg=<html><br><b>You are running VisualVM using an unsupported Java version: {0}.</b><br><br>Please use JDK 8 to JDK 20 to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {1}<br>JVM: {2}<br>Location: {3}</i><br><br></html>
 VisualVMStartup_JreMsg=<html><br><b>You are running VisualVM using Java Runtime Environment (JRE).</b><br><br>Please use Java Development Kit (JDK) to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {0}<br>JVM: {1}<br>Location: {2}</i><br><br></html>
 VisualVMStartup_OpenJ9Msg=<html><br><b>You are running VisualVM using Eclipse OpenJ9.</b><br><br>Please use HotSpot based JDK to run VisualVM. You can still monitor OpenJ9 via JMX.<br>For information about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {0}<br>JVM: {1}<br>Location: {2}</i><br><br></html>
 
diff --git a/visualvm/startup/src/org/graalvm/visualvm/modules/startup/VisualVMStartup.java b/visualvm/startup/src/org/graalvm/visualvm/modules/startup/VisualVMStartup.java
@@ -116,7 +116,8 @@ private static boolean isSupportedJava() {
             || javaVersion.startsWith("16") // NOI18N
             || javaVersion.startsWith("17") // NOI18N
             || javaVersion.startsWith("18") // NOI18N
-            || javaVersion.startsWith("19");// NOI18N
+            || javaVersion.startsWith("19") // NOI18N
+            || javaVersion.startsWith("20");// NOI18N
     }
     
     private static boolean isOpenJ9() {

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,8 @@ public JvmJvmstatModel createModelFor(Application app) {`
`80`	`80`	`else if (isJavaVersion(javaVersion,"18")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
`81`	`81`	`// JVM 19`
`82`	`82`	`else if (isJavaVersion(javaVersion,"19")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
	`83`	`+ // JVM 20`
	`84`	`+ else if (isJavaVersion(javaVersion,"20")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
`83`	`85`	`}`
`84`	`86`
`85`	`87`	`if (model == null) {`