GH-362 JDK 18-ea support added

thurka · thurka · commit 291fc36b7162 · 2021-11-26T18:19:24.000+01:00
diff --git a/plugins/jfr.streaming/src/org/graalvm/visualvm/jfr/streaming/ThreadMonitoringProvider.java b/plugins/jfr.streaming/src/org/graalvm/visualvm/jfr/streaming/ThreadMonitoringProvider.java
@@ -56,7 +56,7 @@ public ThreadMonitoredDataResponseProvider getMonitoredDataResponseProvider(Appl
         try {
             Jvm jvm = JvmFactory.getJVMFor(app);
             String ver = jvm.getJavaVersion();
-            if (isJavaVersion(ver, "17")) {
+            if (isJavaVersion(ver, "17") || isJavaVersion(ver, "18")) {
                 JmxModel jmx = JmxModelFactory.getJmxModelFor(app);
                 RemoteRecordingStream rs = new RemoteRecordingStream(jmx.getMBeanServerConnection());
                 JFRThreadDataProvider rp = new JFRThreadDataProvider(rs, threadMXBean);
diff --git a/visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/JvmJvmstatModelProvider.java b/visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/JvmJvmstatModelProvider.java
@@ -76,6 +76,8 @@ public JvmJvmstatModel createModelFor(Application app) {
                 else if (isJavaVersion(javaVersion,"16")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
                 // JVM 17
                 else if (isJavaVersion(javaVersion,"17")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
+                // JVM 18
+                else if (isJavaVersion(javaVersion,"18")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
             }
             
             if (model == null) {
diff --git a/visualvm/launcher/visualvm.conf b/visualvm/launcher/visualvm.conf
@@ -58,7 +58,7 @@ visualvm_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev"
 # (can be overridden by explicit command line switches)
 #
 
-visualvm_default_options="-J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dnetbeans.importclass=org.graalvm.visualvm.modules.startup.ImportSettings -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J-Djdk.attach.allowAttachSelf=true -J-Dorg.openide.util.ImageUtilities.level=950 -J--add-exports=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions -J-Dnetbeans.logger.console=true -J-Dnetbeans.exception.report.min.level=900 -J-ea"
+visualvm_default_options="-J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dnetbeans.importclass=org.graalvm.visualvm.modules.startup.ImportSettings -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J-Djdk.attach.allowAttachSelf=true -J-Dorg.openide.util.ImageUtilities.level=950 -J-DTopSecurityManager.disable=true -J--add-exports=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions -J-Dnetbeans.logger.console=true -J-Dnetbeans.exception.report.min.level=900 -J-ea"
 # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-Dnetbeans.exception.report.min.level=900 -J-ea
 
 # Default location of JDK:
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.4
+OpenIDE-Module-Specification-Version: 2.5
 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.9</specification-version>
+                        <specification-version>2.11</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
@@ -35,6 +35,7 @@ IntegrationUtils_PlatformJava140=Java SE 14
 IntegrationUtils_PlatformJava150=Java SE 15
 IntegrationUtils_PlatformJava160=Java SE 16
 IntegrationUtils_PlatformJava170=Java SE 17
+IntegrationUtils_PlatformJava180=Java SE 18
 IntegrationUtils_PlatformJavaCvm=CVM
 IntegrationUtils_PlatformWindowsOs=Windows, 32bit JVM
 IntegrationUtils_PlatformWindowsAmd64Os=Windows, 64bit JVM
@@ -77,6 +78,7 @@ IntegrationUtils_Jdk140Name=Java SE 14 (JRE or JDK)
 IntegrationUtils_Jdk150Name=Java SE 15 (JRE or JDK)
 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_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
@@ -62,6 +62,7 @@ public class IntegrationUtils {
     public static final String PLATFORM_JAVA_150 = messages.getString("IntegrationUtils_PlatformJava150"); // NOI18N
     public static final String PLATFORM_JAVA_160 = messages.getString("IntegrationUtils_PlatformJava160"); // NOI18N
     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_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
@@ -97,6 +98,7 @@ public class IntegrationUtils {
     private static final String JDK_150_NAME = messages.getString("IntegrationUtils_Jdk150Name"); // NOI18N
     private static final String JDK_160_NAME = messages.getString("IntegrationUtils_Jdk160Name"); // NOI18N
     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_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
@@ -284,6 +286,8 @@ public static String getJavaPlatformFromJavaVersionString(String javaVersionStri
             return PLATFORM_JAVA_160;
         } else if (javaVersionString.equals(CommonConstants.JDK_170_STRING)) {
             return PLATFORM_JAVA_170;
+        } else if (javaVersionString.equals(CommonConstants.JDK_180_STRING)) {
+            return PLATFORM_JAVA_180;
         } else if (javaVersionString.equals(CommonConstants.JDK_CVM_STRING)) {
             return PLATFORM_JAVA_CVM;
         }
@@ -363,6 +367,8 @@ public static String getJavaPlatformName(String javaPlatform) {
             return JDK_160_NAME;
         } else if (javaPlatform.equals(PLATFORM_JAVA_170)) {
             return JDK_170_NAME;
+        } else if (javaPlatform.equals(PLATFORM_JAVA_180)) {
+            return JDK_180_NAME;
         } else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
             return JDK_CVM_NAME;
         }
@@ -398,6 +404,8 @@ public static String getJavaPlatformNativeLibrariesDirectoryName(String javaPlat
             return "jdk16"; //NOI18N // for JDK 16 we use the same as for 6.0 for now
         } else if (javaPlatform.equals(PLATFORM_JAVA_170)) {
             return "jdk16"; //NOI18N // for JDK 17 we use the same as for 6.0 for now
+        } else if (javaPlatform.equals(PLATFORM_JAVA_180)) {
+            return "jdk16"; //NOI18N // for JDK 17 we use the same as for 6.0 for now
         } else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
             return "cvm";  // NOI18N
         }
@@ -456,6 +464,8 @@ public static String getLocalJavaPlatform() {
             return PLATFORM_JAVA_160;
         } else if (jdkVersion == Platform.JDK_170) {
             return PLATFORM_JAVA_170;
+        } else if (jdkVersion == Platform.JDK_180) {
+            return PLATFORM_JAVA_180;
         }
 
         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.10
+OpenIDE-Module-Specification-Version: 2.11
 
diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/TargetAppRunner.java b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/TargetAppRunner.java
@@ -684,7 +684,8 @@ private boolean startTargetVM(String[] jvmArgs, String mainClassName, String[] m
             || jdkVer.equals(JDK_140_STRING)
             || jdkVer.equals(JDK_150_STRING)
             || jdkVer.equals(JDK_160_STRING)
-            || jdkVer.equals(JDK_170_STRING)) {
+            || jdkVer.equals(JDK_170_STRING)
+            || jdkVer.equals(JDK_180_STRING)) {
             // for now the 1.6 and 1.7 and 1.8 and 9 and 10+ profiling uses the same jfluid-server as 1.5
             jdkVer = JDK_15_STRING;
         }
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
@@ -88,6 +88,7 @@ public interface CommonConstants {
     public static final int JDK_150 = 13;
     public static final int JDK_160 = 14;
     public static final int JDK_170 = 15;
+    public static final int JDK_180 = 16;
     public static final int JDK_CVM = 5;
     public static final int JDK_UNSUPPORTED = -1;
 
@@ -105,6 +106,7 @@ public interface CommonConstants {
     public static final String JDK_150_STRING = "jdk150"; // NOI18N
     public static final String JDK_160_STRING = "jdk160"; // NOI18N
     public static final String JDK_170_STRING = "jdk170"; // NOI18N
+    public static final String JDK_180_STRING = "jdk180"; // 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
@@ -164,7 +164,7 @@ public static String getAgentNativeLibFullName(String fullAgentPath, boolean ful
             || jdkString.equals(JDK_110_STRING) || jdkString.equals(JDK_120_STRING)
             || jdkString.equals(JDK_130_STRING) || jdkString.equals(JDK_140_STRING)
             || jdkString.equals(JDK_150_STRING) || jdkString.equals(JDK_160_STRING)
-            || jdkString.equals(JDK_170_STRING)) {
+            || jdkString.equals(JDK_170_STRING) || jdkString.equals(JDK_180_STRING)) {
             // for now, we use the same libs for 1.6 and 1.7 and 1.8 and 1.9 and 10+
             jdkString = JDK_16_STRING;
         }
@@ -299,6 +299,8 @@ public static int getJDKVersionNumber(String javaVersion) {
             jdkVersion = JDK_160;
         } else if (isJavaVersion(javaVersion,"17")) { // NOI18N
             jdkVersion = JDK_170;
+        } else if (isJavaVersion(javaVersion,"18")) { // NOI18N
+            jdkVersion = JDK_180;
         } else if (javaVersion.equals("CVM")) { // NOI18N
             jdkVersion = JDK_CVM;
         } else {
@@ -347,6 +349,7 @@ public static String getJDKVersionString(String javaVersionString) {
             case JDK_150: return JDK_150_STRING;
             case JDK_160: return JDK_160_STRING;
             case JDK_170: return JDK_170_STRING;
+            case JDK_180: return JDK_180_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 = 61;
+    public static final int JAVA_MAJOR_VERSION = 62;
     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.4</specification-version>
+                        <specification-version>2.5</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
@@ -45,7 +45,8 @@ public class TargetPlatformEnum {
                                                  IntegrationUtils.PLATFORM_JAVA_110,IntegrationUtils.PLATFORM_JAVA_120,
                                                  IntegrationUtils.PLATFORM_JAVA_130,IntegrationUtils.PLATFORM_JAVA_140,
                                                  IntegrationUtils.PLATFORM_JAVA_150,IntegrationUtils.PLATFORM_JAVA_160,
-                                                 IntegrationUtils.PLATFORM_JAVA_170,IntegrationUtils.PLATFORM_JAVA_CVM,
+                                                 IntegrationUtils.PLATFORM_JAVA_170,IntegrationUtils.PLATFORM_JAVA_180,
+                                                 IntegrationUtils.PLATFORM_JAVA_CVM,
                                              };
     public static final TargetPlatformEnum JDK5 = new TargetPlatformEnum(0);
     public static final TargetPlatformEnum JDK6 = new TargetPlatformEnum(1);
@@ -60,7 +61,8 @@ public class TargetPlatformEnum {
     public static final TargetPlatformEnum JDK15 = new TargetPlatformEnum(10);
     public static final TargetPlatformEnum JDK16 = new TargetPlatformEnum(11);
     public static final TargetPlatformEnum JDK17 = new TargetPlatformEnum(12);
-    public static final TargetPlatformEnum JDK_CVM = new TargetPlatformEnum(13);
+    public static final TargetPlatformEnum JDK18 = new TargetPlatformEnum(13);
+    public static final TargetPlatformEnum JDK_CVM = new TargetPlatformEnum(14);
 
     //~ Instance fields ----------------------------------------------------------------------------------------------------------
 
@@ -88,7 +90,7 @@ public int hashCode() {
     }
 
     public static Iterator iterator() {
-        List jvmList = new ArrayList(14);
+        List jvmList = new ArrayList(15);
         jvmList.add(JDK5);
         jvmList.add(JDK6);
         jvmList.add(JDK7);
@@ -102,6 +104,7 @@ public static Iterator iterator() {
         jvmList.add(JDK15);
         jvmList.add(JDK16);
         jvmList.add(JDK17);
+        jvmList.add(JDK18);
         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
@@ -67,6 +67,7 @@ abstract public class AbstractRemotePackExporter {
             put(TargetPlatformEnum.JDK15.toString(), "15"); //NOI18N
             put(TargetPlatformEnum.JDK16.toString(), "15"); //NOI18N
             put(TargetPlatformEnum.JDK17.toString(), "15"); //NOI18N
+            put(TargetPlatformEnum.JDK18.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
@@ -167,6 +167,8 @@ static String getJavaName(String code) {
             return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 16); // NOI18N
         if (Platform.JDK_170_STRING.equals(code))
             return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 17); // NOI18N
+        if (Platform.JDK_180_STRING.equals(code))
+            return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 18); // NOI18N
         throw new IllegalArgumentException("Unknown java code " + code); // NOI18N
     }
     
@@ -422,8 +424,8 @@ private List<String> getSupprtedJavaPlatformIds() {
             String code = "jdk1" + i; // NOI18N
             if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) codesl.add(code);
         }
-        // jdk 10 .. jdk 17
-        for (int i = 10; i <= 17; i++) {
+        // jdk 10 .. jdk 18
+        for (int i = 10; i <= 18; 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 17 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 18 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
@@ -114,7 +114,8 @@ private static boolean isSupportedJava() {
             || javaVersion.startsWith("14") // NOI18N
             || javaVersion.startsWith("15") // NOI18N
             || javaVersion.startsWith("16") // NOI18N
-            || javaVersion.startsWith("17");// NOI18N
+            || javaVersion.startsWith("17") // NOI18N
+            || javaVersion.startsWith("18");// NOI18N
     }
     
     private static boolean isOpenJ9() {

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,8 @@ public JvmJvmstatModel createModelFor(Application app) {`
`76`	`76`	`else if (isJavaVersion(javaVersion,"16")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
`77`	`77`	`// JVM 17`
`78`	`78`	`else if (isJavaVersion(javaVersion,"17")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
	`79`	`+ // JVM 18`
	`80`	`+ else if (isJavaVersion(javaVersion,"18")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N`
`79`	`81`	`}`
`80`	`82`
`81`	`83`	`if (model == null) {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ visualvm_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev"`
`58`	`58`	`# (can be overridden by explicit command line switches)`
`59`	`59`	`#`
`60`	`60`
`61`		-visualvm_default_options="-J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dnetbeans.importclass=org.graalvm.visualvm.modules.startup.ImportSettings -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J-Djdk.attach.allowAttachSelf=true -J-Dorg.openide.util.ImageUtilities.level=950 -J--add-exports=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions -J-Dnetbeans.logger.console=true -J-Dnetbeans.exception.report.min.level=900 -J-ea"
	`61`	+visualvm_default_options="-J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dnetbeans.importclass=org.graalvm.visualvm.modules.startup.ImportSettings -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J-Djdk.attach.allowAttachSelf=true -J-Dorg.openide.util.ImageUtilities.level=950 -J-DTopSecurityManager.disable=true -J--add-exports=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions -J-Dnetbeans.logger.console=true -J-Dnetbeans.exception.report.min.level=900 -J-ea"
`62`	`62`	`# for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-Dnetbeans.exception.report.min.level=900 -J-ea`
`63`	`63`
`64`	`64`	`# Default location of JDK:`