Skip to content

Commit 9b5ae53

Browse files
thurkathurka
committed
GH-602 JDK 24 support added
1 parent 962c331 commit 9b5ae53

File tree

19 files changed

+42
-16
lines changed

19 files changed

+42
-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.5
7+
OpenIDE-Module-Specification-Version: 1.6

‎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
@@ -53,7 +53,7 @@ public static JFRStream getFor(Application app) throws IOException {
5353
if (isJavaVersion(ver, "17") || isJavaVersion(ver, "18")
5454
|| isJavaVersion(ver, "19") || isJavaVersion(ver, "20")
5555
|| isJavaVersion(ver, "21") || isJavaVersion(ver, "22")
56-
|| isJavaVersion(ver, "23")) {
56+
|| isJavaVersion(ver, "23") || isJavaVersion(ver, "24")) {
5757
JmxModel jmxModel = JmxModelFactory.getJmxModelFor(app);
5858
if (jmxModel != null && jmxModel.getConnectionState() == JmxModel.ConnectionState.CONNECTED) {
5959
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
@@ -88,6 +88,8 @@ public JvmJvmstatModel createModelFor(Application app) {
8888
else if (isJavaVersion(javaVersion,"22")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
8989
// JVM 23
9090
else if (isJavaVersion(javaVersion,"23")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
91+
// JVM 24
92+
else if (isJavaVersion(javaVersion,"24")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
9193
}
9294

9395
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.11
4+
OpenIDE-Module-Specification-Version: 2.12
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.18</specification-version>
39+
<specification-version>2.19</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
@@ -41,6 +41,7 @@ IntegrationUtils_PlatformJava200=Java SE 20
4141
IntegrationUtils_PlatformJava210=Java SE 21
4242
IntegrationUtils_PlatformJava220=Java SE 22
4343
IntegrationUtils_PlatformJava230=Java SE 23
44+
IntegrationUtils_PlatformJava240=Java SE 24
4445
IntegrationUtils_PlatformJavaCvm=CVM
4546
IntegrationUtils_PlatformWindowsOs=Windows, 32bit JVM
4647
IntegrationUtils_PlatformWindowsAmd64Os=Windows, 64bit JVM
@@ -89,6 +90,7 @@ IntegrationUtils_Jdk200Name=Java SE 20 (JRE or JDK)
8990
IntegrationUtils_Jdk210Name=Java SE 21 (JRE or JDK)
9091
IntegrationUtils_Jdk220Name=Java SE 22 (JRE or JDK)
9192
IntegrationUtils_Jdk230Name=Java SE 23 (JRE or JDK)
93+
IntegrationUtils_Jdk240Name=Java SE 24 (JRE or JDK)
9294
IntegrationUtils_JdkCvmName=CVM
9395
IntegrationUtils_RemoteString=remote
9496
# 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
@@ -68,6 +68,7 @@ public class IntegrationUtils {
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
7070
public static final String PLATFORM_JAVA_230 = messages.getString("IntegrationUtils_PlatformJava230"); // NOI18N
71+
public static final String PLATFORM_JAVA_240 = messages.getString("IntegrationUtils_PlatformJava240"); // NOI18N
7172
public static final String PLATFORM_JAVA_CVM = messages.getString("IntegrationUtils_PlatformJavaCvm"); // NOI18N
7273
public static final String PLATFORM_WINDOWS_OS = messages.getString("IntegrationUtils_PlatformWindowsOs"); // NOI18N
7374
public static final String PLATFORM_WINDOWS_AMD64_OS = messages.getString("IntegrationUtils_PlatformWindowsAmd64Os"); // NOI18N
@@ -109,6 +110,7 @@ public class IntegrationUtils {
109110
private static final String JDK_210_NAME = messages.getString("IntegrationUtils_Jdk210Name"); // NOI18N
110111
private static final String JDK_220_NAME = messages.getString("IntegrationUtils_Jdk220Name"); // NOI18N
111112
private static final String JDK_230_NAME = messages.getString("IntegrationUtils_Jdk230Name"); // NOI18N
113+
private static final String JDK_240_NAME = messages.getString("IntegrationUtils_Jdk240Name"); // NOI18N
112114
private static final String JDK_CVM_NAME = messages.getString("IntegrationUtils_JdkCvmName"); // NOI18N
113115
private static final String HTML_REMOTE_STRING = "&lt;" + messages.getString("IntegrationUtils_RemoteString") + "&gt;"; // NOI18N
114116
private static final String EXPORT_SETENV_MESSAGE = messages.getString("IntegrationUtils_ExportSetenvMessage"); // NOI18N
@@ -308,6 +310,8 @@ public static String getJavaPlatformFromJavaVersionString(String javaVersionStri
308310
return PLATFORM_JAVA_220;
309311
} else if (javaVersionString.equals(CommonConstants.JDK_230_STRING)) {
310312
return PLATFORM_JAVA_230;
313+
} else if (javaVersionString.equals(CommonConstants.JDK_240_STRING)) {
314+
return PLATFORM_JAVA_240;
311315
} else if (javaVersionString.equals(CommonConstants.JDK_CVM_STRING)) {
312316
return PLATFORM_JAVA_CVM;
313317
}
@@ -399,6 +403,8 @@ public static String getJavaPlatformName(String javaPlatform) {
399403
return JDK_220_NAME;
400404
} else if (javaPlatform.equals(PLATFORM_JAVA_230)) {
401405
return JDK_230_NAME;
406+
} else if (javaPlatform.equals(PLATFORM_JAVA_240)) {
407+
return JDK_240_NAME;
402408
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
403409
return JDK_CVM_NAME;
404410
}
@@ -446,6 +452,8 @@ public static String getJavaPlatformNativeLibrariesDirectoryName(String javaPlat
446452
return "jdk16"; //NOI18N // for JDK 22 we use the same as for 6.0 for now
447453
} else if (javaPlatform.equals(PLATFORM_JAVA_230)) {
448454
return "jdk16"; //NOI18N // for JDK 23 we use the same as for 6.0 for now
455+
} else if (javaPlatform.equals(PLATFORM_JAVA_240)) {
456+
return "jdk16"; //NOI18N // for JDK 24 we use the same as for 6.0 for now
449457
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
450458
return "cvm"; // NOI18N
451459
}
@@ -516,6 +524,8 @@ public static String getLocalJavaPlatform() {
516524
return PLATFORM_JAVA_220;
517525
} else if (jdkVersion == Platform.JDK_230) {
518526
return PLATFORM_JAVA_230;
527+
} else if (jdkVersion == Platform.JDK_240) {
528+
return PLATFORM_JAVA_240;
519529
}
520530

521531
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.18
4+
OpenIDE-Module-Specification-Version: 2.19
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
@@ -94,6 +94,7 @@ public interface CommonConstants {
9494
public static final int JDK_210 = 19;
9595
public static final int JDK_220 = 20;
9696
public static final int JDK_230 = 21;
97+
public static final int JDK_240 = 22;
9798
public static final int JDK_CVM = 5;
9899
public static final int JDK_UNSUPPORTED = -1;
99100

@@ -117,6 +118,7 @@ public interface CommonConstants {
117118
public static final String JDK_210_STRING = "jdk210"; // NOI18N
118119
public static final String JDK_220_STRING = "jdk220"; // NOI18N
119120
public static final String JDK_230_STRING = "jdk230"; // NOI18N
121+
public static final String JDK_240_STRING = "jdk240"; // NOI18N
120122
public static final String JDK_CVM_STRING = "cvm"; // NOI18N
121123
public static final String JDK_UNSUPPORTED_STRING = "UNSUPPORTED_JDK"; // NOI18N
122124

‎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
@@ -307,6 +307,8 @@ public static int getJDKVersionNumber(String javaVersion) {
307307
jdkVersion = JDK_220;
308308
} else if (isJavaVersion(javaVersion,"23")) { // NOI18N
309309
jdkVersion = JDK_230;
310+
} else if (isJavaVersion(javaVersion,"24")) { // NOI18N
311+
jdkVersion = JDK_240;
310312
} else if (javaVersion.equals("CVM")) { // NOI18N
311313
jdkVersion = JDK_CVM;
312314
} else {
@@ -361,6 +363,7 @@ public static String getJDKVersionString(String javaVersionString) {
361363
case JDK_210: return JDK_210_STRING;
362364
case JDK_220: return JDK_220_STRING;
363365
case JDK_230: return JDK_230_STRING;
366+
case JDK_240: return JDK_240_STRING;
364367
case JDK_CVM: return JDK_CVM_STRING;
365368
case JDK_UNSUPPORTED: return JDK_UNSUPPORTED_STRING;
366369
}

0 commit comments

Comments
 (0)