Skip to content

Commit 782867a

Browse files
thurkathurka
committed
GH-556 JDK 22 support added
1 parent c8dab54 commit 782867a

File tree

19 files changed

+41
-16
lines changed

19 files changed

+41
-16
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.3
7+
OpenIDE-Module-Specification-Version: 1.4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static JFRStream getFor(Application app) throws IOException {
5252
String ver = jvm.getJavaVersion();
5353
if (isJavaVersion(ver, "17") || isJavaVersion(ver, "18")
5454
|| isJavaVersion(ver, "19") || isJavaVersion(ver, "20")
55-
|| isJavaVersion(ver, "21")) {
55+
|| isJavaVersion(ver, "21") || isJavaVersion(ver, "22")) {
5656
JmxModel jmxModel = JmxModelFactory.getJmxModelFor(app);
5757
if (jmxModel != null && jmxModel.getConnectionState() == JmxModel.ConnectionState.CONNECTED) {
5858
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
@@ -84,6 +84,8 @@ public JvmJvmstatModel createModelFor(Application app) {
8484
else if (isJavaVersion(javaVersion,"20")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
8585
// JVM 21
8686
else if (isJavaVersion(javaVersion,"21")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
87+
// JVM 22
88+
else if (isJavaVersion(javaVersion,"22")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
8789
}
8890

8991
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.9
4+
OpenIDE-Module-Specification-Version: 2.10
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.16</specification-version>
39+
<specification-version>2.17</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
@@ -39,6 +39,7 @@ IntegrationUtils_PlatformJava180=Java SE 18
3939
IntegrationUtils_PlatformJava190=Java SE 19
4040
IntegrationUtils_PlatformJava200=Java SE 20
4141
IntegrationUtils_PlatformJava210=Java SE 21
42+
IntegrationUtils_PlatformJava220=Java SE 22
4243
IntegrationUtils_PlatformJavaCvm=CVM
4344
IntegrationUtils_PlatformWindowsOs=Windows, 32bit JVM
4445
IntegrationUtils_PlatformWindowsAmd64Os=Windows, 64bit JVM
@@ -85,6 +86,7 @@ IntegrationUtils_Jdk180Name=Java SE 18 (JRE or JDK)
8586
IntegrationUtils_Jdk190Name=Java SE 19 (JRE or JDK)
8687
IntegrationUtils_Jdk200Name=Java SE 20 (JRE or JDK)
8788
IntegrationUtils_Jdk210Name=Java SE 21 (JRE or JDK)
89+
IntegrationUtils_Jdk220Name=Java SE 22 (JRE or JDK)
8890
IntegrationUtils_JdkCvmName=CVM
8991
IntegrationUtils_RemoteString=remote
9092
# 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
@@ -66,6 +66,7 @@ public class IntegrationUtils {
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
6868
public static final String PLATFORM_JAVA_210 = messages.getString("IntegrationUtils_PlatformJava210"); // NOI18N
69+
public static final String PLATFORM_JAVA_220 = messages.getString("IntegrationUtils_PlatformJava220"); // NOI18N
6970
public static final String PLATFORM_JAVA_CVM = messages.getString("IntegrationUtils_PlatformJavaCvm"); // NOI18N
7071
public static final String PLATFORM_WINDOWS_OS = messages.getString("IntegrationUtils_PlatformWindowsOs"); // NOI18N
7172
public static final String PLATFORM_WINDOWS_AMD64_OS = messages.getString("IntegrationUtils_PlatformWindowsAmd64Os"); // NOI18N
@@ -105,6 +106,7 @@ public class IntegrationUtils {
105106
private static final String JDK_190_NAME = messages.getString("IntegrationUtils_Jdk190Name"); // NOI18N
106107
private static final String JDK_200_NAME = messages.getString("IntegrationUtils_Jdk200Name"); // NOI18N
107108
private static final String JDK_210_NAME = messages.getString("IntegrationUtils_Jdk210Name"); // NOI18N
109+
private static final String JDK_220_NAME = messages.getString("IntegrationUtils_Jdk220Name"); // NOI18N
108110
private static final String JDK_CVM_NAME = messages.getString("IntegrationUtils_JdkCvmName"); // NOI18N
109111
private static final String HTML_REMOTE_STRING = "&lt;" + messages.getString("IntegrationUtils_RemoteString") + "&gt;"; // NOI18N
110112
private static final String EXPORT_SETENV_MESSAGE = messages.getString("IntegrationUtils_ExportSetenvMessage"); // NOI18N
@@ -300,6 +302,8 @@ public static String getJavaPlatformFromJavaVersionString(String javaVersionStri
300302
return PLATFORM_JAVA_200;
301303
} else if (javaVersionString.equals(CommonConstants.JDK_210_STRING)) {
302304
return PLATFORM_JAVA_210;
305+
} else if (javaVersionString.equals(CommonConstants.JDK_220_STRING)) {
306+
return PLATFORM_JAVA_220;
303307
} else if (javaVersionString.equals(CommonConstants.JDK_CVM_STRING)) {
304308
return PLATFORM_JAVA_CVM;
305309
}
@@ -387,6 +391,8 @@ public static String getJavaPlatformName(String javaPlatform) {
387391
return JDK_200_NAME;
388392
} else if (javaPlatform.equals(PLATFORM_JAVA_210)) {
389393
return JDK_210_NAME;
394+
} else if (javaPlatform.equals(PLATFORM_JAVA_220)) {
395+
return JDK_220_NAME;
390396
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
391397
return JDK_CVM_NAME;
392398
}
@@ -430,6 +436,8 @@ public static String getJavaPlatformNativeLibrariesDirectoryName(String javaPlat
430436
return "jdk16"; //NOI18N // for JDK 20 we use the same as for 6.0 for now
431437
} else if (javaPlatform.equals(PLATFORM_JAVA_210)) {
432438
return "jdk16"; //NOI18N // for JDK 20 we use the same as for 6.0 for now
439+
} else if (javaPlatform.equals(PLATFORM_JAVA_220)) {
440+
return "jdk16"; //NOI18N // for JDK 20 we use the same as for 6.0 for now
433441
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
434442
return "cvm"; // NOI18N
435443
}
@@ -496,6 +504,8 @@ public static String getLocalJavaPlatform() {
496504
return PLATFORM_JAVA_200;
497505
} else if (jdkVersion == Platform.JDK_210) {
498506
return PLATFORM_JAVA_210;
507+
} else if (jdkVersion == Platform.JDK_220) {
508+
return PLATFORM_JAVA_220;
499509
}
500510

501511
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.16
4+
OpenIDE-Module-Specification-Version: 2.17
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
@@ -92,6 +92,7 @@ public interface CommonConstants {
9292
public static final int JDK_190 = 17;
9393
public static final int JDK_200 = 18;
9494
public static final int JDK_210 = 19;
95+
public static final int JDK_220 = 20;
9596
public static final int JDK_CVM = 5;
9697
public static final int JDK_UNSUPPORTED = -1;
9798

@@ -113,6 +114,7 @@ public interface CommonConstants {
113114
public static final String JDK_190_STRING = "jdk190"; // NOI18N
114115
public static final String JDK_200_STRING = "jdk200"; // NOI18N
115116
public static final String JDK_210_STRING = "jdk210"; // NOI18N
117+
public static final String JDK_220_STRING = "jdk220"; // NOI18N
116118
public static final String JDK_CVM_STRING = "cvm"; // NOI18N
117119
public static final String JDK_UNSUPPORTED_STRING = "UNSUPPORTED_JDK"; // NOI18N
118120

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,8 @@ public static int getJDKVersionNumber(String javaVersion) {
303303
jdkVersion = JDK_200;
304304
} else if (isJavaVersion(javaVersion,"21")) { // NOI18N
305305
jdkVersion = JDK_210;
306+
} else if (isJavaVersion(javaVersion,"22")) { // NOI18N
307+
jdkVersion = JDK_220;
306308
} else if (javaVersion.equals("CVM")) { // NOI18N
307309
jdkVersion = JDK_CVM;
308310
} else {

0 commit comments

Comments
 (0)