Skip to content

Commit 15f5f80

Browse files
thurkathurka
committed
GH-516 JDK 21-ea support added
1 parent b1eb8c0 commit 15f5f80

File tree

19 files changed

+44
-17
lines changed

19 files changed

+44
-17
lines changed

‎plugins/jfr.streaming/manifest.mf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ OpenIDE-Module: org.graalvm.visualvm.jfr.streaming
44
OpenIDE-Module-Install: org/graalvm/visualvm/jfr/streaming/Installer.class
55
OpenIDE-Module-Java-Dependencies: Java > 17
66
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jfr/streaming/Bundle.properties
7-
OpenIDE-Module-Specification-Version: 1.2
7+
OpenIDE-Module-Specification-Version: 1.3

‎plugins/jfr.streaming/src/org/graalvm/visualvm/jfr/streaming/JFRStream.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ public class JFRStream {
5050
public static JFRStream getFor(Application app) throws IOException {
5151
Jvm jvm = JvmFactory.getJVMFor(app);
5252
String ver = jvm.getJavaVersion();
53-
if (isJavaVersion(ver, "17") || isJavaVersion(ver, "18") || isJavaVersion(ver, "19") || isJavaVersion(ver, "20")) {
53+
if (isJavaVersion(ver, "17") || isJavaVersion(ver, "18")
54+
|| isJavaVersion(ver, "19") || isJavaVersion(ver, "20")
55+
|| isJavaVersion(ver, "21")) {
5456
JmxModel jmxModel = JmxModelFactory.getJmxModelFor(app);
5557
if (jmxModel != null && jmxModel.getConnectionState() == JmxModel.ConnectionState.CONNECTED) {
5658
return new JFRStream(jmxModel);

‎visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/JvmJvmstatModelProvider.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ public JvmJvmstatModel createModelFor(Application app) {
8282
else if (isJavaVersion(javaVersion,"19")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
8383
// JVM 20
8484
else if (isJavaVersion(javaVersion,"20")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
85+
// JVM 21
86+
else if (isJavaVersion(javaVersion,"21")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
8587
}
8688

8789
if (model == null) {

‎visualvm/libs.profiler/lib.profiler.common/manifest.mf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Manifest-Version: 1.0
22
OpenIDE-Module: org.graalvm.visualvm.lib.common/2
33
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/common/Bundle.properties
4-
OpenIDE-Module-Specification-Version: 2.7
4+
OpenIDE-Module-Specification-Version: 2.8
55
OpenIDE-Module-Needs: org.graalvm.visualvm.lib.common.Profiler
66

‎visualvm/libs.profiler/lib.profiler.common/nbproject/project.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<compile-dependency/>
3737
<run-dependency>
3838
<release-version>2</release-version>
39-
<specification-version>2.13</specification-version>
39+
<specification-version>2.15</specification-version>
4040
</run-dependency>
4141
</dependency>
4242
<dependency>

‎visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/Bundle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ IntegrationUtils_PlatformJava170=Java SE 17
3838
IntegrationUtils_PlatformJava180=Java SE 18
3939
IntegrationUtils_PlatformJava190=Java SE 19
4040
IntegrationUtils_PlatformJava200=Java SE 20
41+
IntegrationUtils_PlatformJava210=Java SE 21
4142
IntegrationUtils_PlatformJavaCvm=CVM
4243
IntegrationUtils_PlatformWindowsOs=Windows, 32bit JVM
4344
IntegrationUtils_PlatformWindowsAmd64Os=Windows, 64bit JVM
@@ -83,6 +84,7 @@ IntegrationUtils_Jdk170Name=Java SE 17 (JRE or JDK)
8384
IntegrationUtils_Jdk180Name=Java SE 18 (JRE or JDK)
8485
IntegrationUtils_Jdk190Name=Java SE 19 (JRE or JDK)
8586
IntegrationUtils_Jdk200Name=Java SE 20 (JRE or JDK)
87+
IntegrationUtils_Jdk210Name=Java SE 21 (JRE or JDK)
8688
IntegrationUtils_JdkCvmName=CVM
8789
IntegrationUtils_RemoteString=remote
8890
# HTML-formatted

‎visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/IntegrationUtils.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public class IntegrationUtils {
6565
public static final String PLATFORM_JAVA_180 = messages.getString("IntegrationUtils_PlatformJava180"); // NOI18N
6666
public static final String PLATFORM_JAVA_190 = messages.getString("IntegrationUtils_PlatformJava190"); // NOI18N
6767
public static final String PLATFORM_JAVA_200 = messages.getString("IntegrationUtils_PlatformJava200"); // NOI18N
68+
public static final String PLATFORM_JAVA_210 = messages.getString("IntegrationUtils_PlatformJava210"); // NOI18N
6869
public static final String PLATFORM_JAVA_CVM = messages.getString("IntegrationUtils_PlatformJavaCvm"); // NOI18N
6970
public static final String PLATFORM_WINDOWS_OS = messages.getString("IntegrationUtils_PlatformWindowsOs"); // NOI18N
7071
public static final String PLATFORM_WINDOWS_AMD64_OS = messages.getString("IntegrationUtils_PlatformWindowsAmd64Os"); // NOI18N
@@ -103,6 +104,7 @@ public class IntegrationUtils {
103104
private static final String JDK_180_NAME = messages.getString("IntegrationUtils_Jdk180Name"); // NOI18N
104105
private static final String JDK_190_NAME = messages.getString("IntegrationUtils_Jdk190Name"); // NOI18N
105106
private static final String JDK_200_NAME = messages.getString("IntegrationUtils_Jdk200Name"); // NOI18N
107+
private static final String JDK_210_NAME = messages.getString("IntegrationUtils_Jdk210Name"); // NOI18N
106108
private static final String JDK_CVM_NAME = messages.getString("IntegrationUtils_JdkCvmName"); // NOI18N
107109
private static final String HTML_REMOTE_STRING = "&lt;" + messages.getString("IntegrationUtils_RemoteString") + "&gt;"; // NOI18N
108110
private static final String EXPORT_SETENV_MESSAGE = messages.getString("IntegrationUtils_ExportSetenvMessage"); // NOI18N
@@ -296,6 +298,8 @@ public static String getJavaPlatformFromJavaVersionString(String javaVersionStri
296298
return PLATFORM_JAVA_190;
297299
} else if (javaVersionString.equals(CommonConstants.JDK_200_STRING)) {
298300
return PLATFORM_JAVA_200;
301+
} else if (javaVersionString.equals(CommonConstants.JDK_210_STRING)) {
302+
return PLATFORM_JAVA_210;
299303
} else if (javaVersionString.equals(CommonConstants.JDK_CVM_STRING)) {
300304
return PLATFORM_JAVA_CVM;
301305
}
@@ -381,6 +385,8 @@ public static String getJavaPlatformName(String javaPlatform) {
381385
return JDK_190_NAME;
382386
} else if (javaPlatform.equals(PLATFORM_JAVA_200)) {
383387
return JDK_200_NAME;
388+
} else if (javaPlatform.equals(PLATFORM_JAVA_210)) {
389+
return JDK_210_NAME;
384390
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
385391
return JDK_CVM_NAME;
386392
}
@@ -422,6 +428,8 @@ public static String getJavaPlatformNativeLibrariesDirectoryName(String javaPlat
422428
return "jdk16"; //NOI18N // for JDK 19 we use the same as for 6.0 for now
423429
} else if (javaPlatform.equals(PLATFORM_JAVA_200)) {
424430
return "jdk16"; //NOI18N // for JDK 20 we use the same as for 6.0 for now
431+
} else if (javaPlatform.equals(PLATFORM_JAVA_210)) {
432+
return "jdk16"; //NOI18N // for JDK 20 we use the same as for 6.0 for now
425433
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
426434
return "cvm"; // NOI18N
427435
}
@@ -486,6 +494,8 @@ public static String getLocalJavaPlatform() {
486494
return PLATFORM_JAVA_190;
487495
} else if (jdkVersion == Platform.JDK_200) {
488496
return PLATFORM_JAVA_200;
497+
} else if (jdkVersion == Platform.JDK_210) {
498+
return PLATFORM_JAVA_210;
489499
}
490500

491501
return null;

‎visualvm/libs.profiler/lib.profiler/manifest.mf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Manifest-Version: 1.0
22
OpenIDE-Module: org.graalvm.visualvm.lib.jfluid/2
33
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/jfluid/Bundle.properties
4-
OpenIDE-Module-Specification-Version: 2.14
4+
OpenIDE-Module-Specification-Version: 2.15
55

‎visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/CommonConstants.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public interface CommonConstants {
9191
public static final int JDK_180 = 16;
9292
public static final int JDK_190 = 17;
9393
public static final int JDK_200 = 18;
94+
public static final int JDK_210 = 19;
9495
public static final int JDK_CVM = 5;
9596
public static final int JDK_UNSUPPORTED = -1;
9697

@@ -111,6 +112,7 @@ public interface CommonConstants {
111112
public static final String JDK_180_STRING = "jdk180"; // NOI18N
112113
public static final String JDK_190_STRING = "jdk190"; // NOI18N
113114
public static final String JDK_200_STRING = "jdk200"; // NOI18N
115+
public static final String JDK_210_STRING = "jdk210"; // NOI18N
114116
public static final String JDK_CVM_STRING = "cvm"; // NOI18N
115117
public static final String JDK_UNSUPPORTED_STRING = "UNSUPPORTED_JDK"; // NOI18N
116118

‎visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/Platform.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,8 @@ public static int getJDKVersionNumber(String javaVersion) {
301301
jdkVersion = JDK_190;
302302
} else if (isJavaVersion(javaVersion,"20")) { // NOI18N
303303
jdkVersion = JDK_200;
304+
} else if (isJavaVersion(javaVersion,"21")) { // NOI18N
305+
jdkVersion = JDK_210;
304306
} else if (javaVersion.equals("CVM")) { // NOI18N
305307
jdkVersion = JDK_CVM;
306308
} else {
@@ -352,6 +354,7 @@ public static String getJDKVersionString(String javaVersionString) {
352354
case JDK_180: return JDK_180_STRING;
353355
case JDK_190: return JDK_190_STRING;
354356
case JDK_200: return JDK_200_STRING;
357+
case JDK_210: return JDK_210_STRING;
355358
case JDK_CVM: return JDK_CVM_STRING;
356359
case JDK_UNSUPPORTED: return JDK_UNSUPPORTED_STRING;
357360
}

0 commit comments

Comments
 (0)