Skip to content

Commit a78ef03

Browse files
thurkathurka
committed
GH-590 JDK 23 support added
1 parent d2d8db7 commit a78ef03

File tree

19 files changed

+44
-18
lines changed

19 files changed

+44
-18
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.4
7+
OpenIDE-Module-Specification-Version: 1.5

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ 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") || isJavaVersion(ver, "22")) {
55+
|| isJavaVersion(ver, "21") || isJavaVersion(ver, "22")
56+
|| isJavaVersion(ver, "23")) {
5657
JmxModel jmxModel = JmxModelFactory.getJmxModelFor(app);
5758
if (jmxModel != null && jmxModel.getConnectionState() == JmxModel.ConnectionState.CONNECTED) {
5859
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
@@ -86,6 +86,8 @@ public JvmJvmstatModel createModelFor(Application app) {
8686
else if (isJavaVersion(javaVersion,"21")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
8787
// JVM 22
8888
else if (isJavaVersion(javaVersion,"22")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
89+
// JVM 23
90+
else if (isJavaVersion(javaVersion,"23")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
8991
}
9092

9193
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.10
4+
OpenIDE-Module-Specification-Version: 2.11
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.17</specification-version>
39+
<specification-version>2.18</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
@@ -40,6 +40,7 @@ IntegrationUtils_PlatformJava190=Java SE 19
4040
IntegrationUtils_PlatformJava200=Java SE 20
4141
IntegrationUtils_PlatformJava210=Java SE 21
4242
IntegrationUtils_PlatformJava220=Java SE 22
43+
IntegrationUtils_PlatformJava230=Java SE 23
4344
IntegrationUtils_PlatformJavaCvm=CVM
4445
IntegrationUtils_PlatformWindowsOs=Windows, 32bit JVM
4546
IntegrationUtils_PlatformWindowsAmd64Os=Windows, 64bit JVM
@@ -87,6 +88,7 @@ IntegrationUtils_Jdk190Name=Java SE 19 (JRE or JDK)
8788
IntegrationUtils_Jdk200Name=Java SE 20 (JRE or JDK)
8889
IntegrationUtils_Jdk210Name=Java SE 21 (JRE or JDK)
8990
IntegrationUtils_Jdk220Name=Java SE 22 (JRE or JDK)
91+
IntegrationUtils_Jdk220Name=Java SE 23 (JRE or JDK)
9092
IntegrationUtils_JdkCvmName=CVM
9193
IntegrationUtils_RemoteString=remote
9294
# HTML-formatted

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public class IntegrationUtils {
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
6969
public static final String PLATFORM_JAVA_220 = messages.getString("IntegrationUtils_PlatformJava220"); // NOI18N
70+
public static final String PLATFORM_JAVA_230 = messages.getString("IntegrationUtils_PlatformJava230"); // NOI18N
7071
public static final String PLATFORM_JAVA_CVM = messages.getString("IntegrationUtils_PlatformJavaCvm"); // NOI18N
7172
public static final String PLATFORM_WINDOWS_OS = messages.getString("IntegrationUtils_PlatformWindowsOs"); // NOI18N
7273
public static final String PLATFORM_WINDOWS_AMD64_OS = messages.getString("IntegrationUtils_PlatformWindowsAmd64Os"); // NOI18N
@@ -107,6 +108,7 @@ public class IntegrationUtils {
107108
private static final String JDK_200_NAME = messages.getString("IntegrationUtils_Jdk200Name"); // NOI18N
108109
private static final String JDK_210_NAME = messages.getString("IntegrationUtils_Jdk210Name"); // NOI18N
109110
private static final String JDK_220_NAME = messages.getString("IntegrationUtils_Jdk220Name"); // NOI18N
111+
private static final String JDK_230_NAME = messages.getString("IntegrationUtils_Jdk230Name"); // NOI18N
110112
private static final String JDK_CVM_NAME = messages.getString("IntegrationUtils_JdkCvmName"); // NOI18N
111113
private static final String HTML_REMOTE_STRING = "&lt;" + messages.getString("IntegrationUtils_RemoteString") + "&gt;"; // NOI18N
112114
private static final String EXPORT_SETENV_MESSAGE = messages.getString("IntegrationUtils_ExportSetenvMessage"); // NOI18N
@@ -304,6 +306,8 @@ public static String getJavaPlatformFromJavaVersionString(String javaVersionStri
304306
return PLATFORM_JAVA_210;
305307
} else if (javaVersionString.equals(CommonConstants.JDK_220_STRING)) {
306308
return PLATFORM_JAVA_220;
309+
} else if (javaVersionString.equals(CommonConstants.JDK_230_STRING)) {
310+
return PLATFORM_JAVA_230;
307311
} else if (javaVersionString.equals(CommonConstants.JDK_CVM_STRING)) {
308312
return PLATFORM_JAVA_CVM;
309313
}
@@ -393,6 +397,8 @@ public static String getJavaPlatformName(String javaPlatform) {
393397
return JDK_210_NAME;
394398
} else if (javaPlatform.equals(PLATFORM_JAVA_220)) {
395399
return JDK_220_NAME;
400+
} else if (javaPlatform.equals(PLATFORM_JAVA_230)) {
401+
return JDK_230_NAME;
396402
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
397403
return JDK_CVM_NAME;
398404
}
@@ -435,9 +441,11 @@ public static String getJavaPlatformNativeLibrariesDirectoryName(String javaPlat
435441
} else if (javaPlatform.equals(PLATFORM_JAVA_200)) {
436442
return "jdk16"; //NOI18N // for JDK 20 we use the same as for 6.0 for now
437443
} else if (javaPlatform.equals(PLATFORM_JAVA_210)) {
438-
return "jdk16"; //NOI18N // for JDK 20 we use the same as for 6.0 for now
444+
return "jdk16"; //NOI18N // for JDK 21 we use the same as for 6.0 for now
439445
} else if (javaPlatform.equals(PLATFORM_JAVA_220)) {
440-
return "jdk16"; //NOI18N // for JDK 20 we use the same as for 6.0 for now
446+
return "jdk16"; //NOI18N // for JDK 22 we use the same as for 6.0 for now
447+
} else if (javaPlatform.equals(PLATFORM_JAVA_230)) {
448+
return "jdk16"; //NOI18N // for JDK 23 we use the same as for 6.0 for now
441449
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
442450
return "cvm"; // NOI18N
443451
}
@@ -506,6 +514,8 @@ public static String getLocalJavaPlatform() {
506514
return PLATFORM_JAVA_210;
507515
} else if (jdkVersion == Platform.JDK_220) {
508516
return PLATFORM_JAVA_220;
517+
} else if (jdkVersion == Platform.JDK_230) {
518+
return PLATFORM_JAVA_230;
509519
}
510520

511521
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.17
4+
OpenIDE-Module-Specification-Version: 2.18
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
@@ -93,6 +93,7 @@ public interface CommonConstants {
9393
public static final int JDK_200 = 18;
9494
public static final int JDK_210 = 19;
9595
public static final int JDK_220 = 20;
96+
public static final int JDK_230 = 21;
9697
public static final int JDK_CVM = 5;
9798
public static final int JDK_UNSUPPORTED = -1;
9899

@@ -115,6 +116,7 @@ public interface CommonConstants {
115116
public static final String JDK_200_STRING = "jdk200"; // NOI18N
116117
public static final String JDK_210_STRING = "jdk210"; // NOI18N
117118
public static final String JDK_220_STRING = "jdk220"; // NOI18N
119+
public static final String JDK_230_STRING = "jdk230"; // NOI18N
118120
public static final String JDK_CVM_STRING = "cvm"; // NOI18N
119121
public static final String JDK_UNSUPPORTED_STRING = "UNSUPPORTED_JDK"; // NOI18N
120122

‎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
@@ -305,6 +305,8 @@ public static int getJDKVersionNumber(String javaVersion) {
305305
jdkVersion = JDK_210;
306306
} else if (isJavaVersion(javaVersion,"22")) { // NOI18N
307307
jdkVersion = JDK_220;
308+
} else if (isJavaVersion(javaVersion,"23")) { // NOI18N
309+
jdkVersion = JDK_230;
308310
} else if (javaVersion.equals("CVM")) { // NOI18N
309311
jdkVersion = JDK_CVM;
310312
} else {
@@ -358,6 +360,7 @@ public static String getJDKVersionString(String javaVersionString) {
358360
case JDK_200: return JDK_200_STRING;
359361
case JDK_210: return JDK_210_STRING;
360362
case JDK_220: return JDK_220_STRING;
363+
case JDK_230: return JDK_230_STRING;
361364
case JDK_CVM: return JDK_CVM_STRING;
362365
case JDK_UNSUPPORTED: return JDK_UNSUPPORTED_STRING;
363366
}

0 commit comments

Comments
 (0)