Skip to content

Commit ec49eef

Browse files
thurkathurka
committed
GH-648 JDK 25 support added
1 parent 285f51c commit ec49eef

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.6
7+
OpenIDE-Module-Specification-Version: 1.7

‎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
@@ -53,7 +53,8 @@ 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") || isJavaVersion(ver, "24")) {
56+
|| isJavaVersion(ver, "23") || isJavaVersion(ver, "24")
57+
|| isJavaVersion(ver, "25")) {
5758
JmxModel jmxModel = JmxModelFactory.getJmxModelFor(app);
5859
if (jmxModel != null && jmxModel.getConnectionState() == JmxModel.ConnectionState.CONNECTED) {
5960
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
@@ -90,6 +90,8 @@ public JvmJvmstatModel createModelFor(Application app) {
9090
else if (isJavaVersion(javaVersion,"23")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
9191
// JVM 24
9292
else if (isJavaVersion(javaVersion,"24")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
93+
// JVM 25
94+
else if (isJavaVersion(javaVersion,"25")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
9395
}
9496

9597
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.12
4+
OpenIDE-Module-Specification-Version: 2.13
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.19</specification-version>
39+
<specification-version>2.20</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
@@ -42,6 +42,7 @@ IntegrationUtils_PlatformJava210=Java SE 21
4242
IntegrationUtils_PlatformJava220=Java SE 22
4343
IntegrationUtils_PlatformJava230=Java SE 23
4444
IntegrationUtils_PlatformJava240=Java SE 24
45+
IntegrationUtils_PlatformJava250=Java SE 25
4546
IntegrationUtils_PlatformJavaCvm=CVM
4647
IntegrationUtils_PlatformWindowsOs=Windows, 32bit JVM
4748
IntegrationUtils_PlatformWindowsAmd64Os=Windows, 64bit JVM
@@ -91,6 +92,7 @@ IntegrationUtils_Jdk210Name=Java SE 21 (JRE or JDK)
9192
IntegrationUtils_Jdk220Name=Java SE 22 (JRE or JDK)
9293
IntegrationUtils_Jdk230Name=Java SE 23 (JRE or JDK)
9394
IntegrationUtils_Jdk240Name=Java SE 24 (JRE or JDK)
95+
IntegrationUtils_Jdk250Name=Java SE 25 (JRE or JDK)
9496
IntegrationUtils_JdkCvmName=CVM
9597
IntegrationUtils_RemoteString=remote
9698
# 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
@@ -69,6 +69,7 @@ public class IntegrationUtils {
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
7171
public static final String PLATFORM_JAVA_240 = messages.getString("IntegrationUtils_PlatformJava240"); // NOI18N
72+
public static final String PLATFORM_JAVA_250 = messages.getString("IntegrationUtils_PlatformJava250"); // NOI18N
7273
public static final String PLATFORM_JAVA_CVM = messages.getString("IntegrationUtils_PlatformJavaCvm"); // NOI18N
7374
public static final String PLATFORM_WINDOWS_OS = messages.getString("IntegrationUtils_PlatformWindowsOs"); // NOI18N
7475
public static final String PLATFORM_WINDOWS_AMD64_OS = messages.getString("IntegrationUtils_PlatformWindowsAmd64Os"); // NOI18N
@@ -111,6 +112,7 @@ public class IntegrationUtils {
111112
private static final String JDK_220_NAME = messages.getString("IntegrationUtils_Jdk220Name"); // NOI18N
112113
private static final String JDK_230_NAME = messages.getString("IntegrationUtils_Jdk230Name"); // NOI18N
113114
private static final String JDK_240_NAME = messages.getString("IntegrationUtils_Jdk240Name"); // NOI18N
115+
private static final String JDK_250_NAME = messages.getString("IntegrationUtils_Jdk250Name"); // NOI18N
114116
private static final String JDK_CVM_NAME = messages.getString("IntegrationUtils_JdkCvmName"); // NOI18N
115117
private static final String HTML_REMOTE_STRING = "&lt;" + messages.getString("IntegrationUtils_RemoteString") + "&gt;"; // NOI18N
116118
private static final String EXPORT_SETENV_MESSAGE = messages.getString("IntegrationUtils_ExportSetenvMessage"); // NOI18N
@@ -312,6 +314,8 @@ public static String getJavaPlatformFromJavaVersionString(String javaVersionStri
312314
return PLATFORM_JAVA_230;
313315
} else if (javaVersionString.equals(CommonConstants.JDK_240_STRING)) {
314316
return PLATFORM_JAVA_240;
317+
} else if (javaVersionString.equals(CommonConstants.JDK_250_STRING)) {
318+
return PLATFORM_JAVA_250;
315319
} else if (javaVersionString.equals(CommonConstants.JDK_CVM_STRING)) {
316320
return PLATFORM_JAVA_CVM;
317321
}
@@ -405,6 +409,8 @@ public static String getJavaPlatformName(String javaPlatform) {
405409
return JDK_230_NAME;
406410
} else if (javaPlatform.equals(PLATFORM_JAVA_240)) {
407411
return JDK_240_NAME;
412+
} else if (javaPlatform.equals(PLATFORM_JAVA_250)) {
413+
return JDK_250_NAME;
408414
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
409415
return JDK_CVM_NAME;
410416
}
@@ -454,6 +460,8 @@ public static String getJavaPlatformNativeLibrariesDirectoryName(String javaPlat
454460
return "jdk16"; //NOI18N // for JDK 23 we use the same as for 6.0 for now
455461
} else if (javaPlatform.equals(PLATFORM_JAVA_240)) {
456462
return "jdk16"; //NOI18N // for JDK 24 we use the same as for 6.0 for now
463+
} else if (javaPlatform.equals(PLATFORM_JAVA_250)) {
464+
return "jdk16"; //NOI18N // for JDK 25 we use the same as for 6.0 for now
457465
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
458466
return "cvm"; // NOI18N
459467
}
@@ -526,6 +534,8 @@ public static String getLocalJavaPlatform() {
526534
return PLATFORM_JAVA_230;
527535
} else if (jdkVersion == Platform.JDK_240) {
528536
return PLATFORM_JAVA_240;
537+
} else if (jdkVersion == Platform.JDK_250) {
538+
return PLATFORM_JAVA_250;
529539
}
530540

531541
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.19
4+
OpenIDE-Module-Specification-Version: 2.20
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
@@ -95,6 +95,7 @@ public interface CommonConstants {
9595
public static final int JDK_220 = 20;
9696
public static final int JDK_230 = 21;
9797
public static final int JDK_240 = 22;
98+
public static final int JDK_250 = 23;
9899
public static final int JDK_CVM = 5;
99100
public static final int JDK_UNSUPPORTED = -1;
100101

@@ -119,6 +120,7 @@ public interface CommonConstants {
119120
public static final String JDK_220_STRING = "jdk220"; // NOI18N
120121
public static final String JDK_230_STRING = "jdk230"; // NOI18N
121122
public static final String JDK_240_STRING = "jdk240"; // NOI18N
123+
public static final String JDK_250_STRING = "jdk250"; // NOI18N
122124
public static final String JDK_CVM_STRING = "cvm"; // NOI18N
123125
public static final String JDK_UNSUPPORTED_STRING = "UNSUPPORTED_JDK"; // NOI18N
124126

‎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
@@ -309,6 +309,8 @@ public static int getJDKVersionNumber(String javaVersion) {
309309
jdkVersion = JDK_230;
310310
} else if (isJavaVersion(javaVersion,"24")) { // NOI18N
311311
jdkVersion = JDK_240;
312+
} else if (isJavaVersion(javaVersion,"25")) { // NOI18N
313+
jdkVersion = JDK_250;
312314
} else if (javaVersion.equals("CVM")) { // NOI18N
313315
jdkVersion = JDK_CVM;
314316
} else {
@@ -364,6 +366,7 @@ public static String getJDKVersionString(String javaVersionString) {
364366
case JDK_220: return JDK_220_STRING;
365367
case JDK_230: return JDK_230_STRING;
366368
case JDK_240: return JDK_240_STRING;
369+
case JDK_250: return JDK_250_STRING;
367370
case JDK_CVM: return JDK_CVM_STRING;
368371
case JDK_UNSUPPORTED: return JDK_UNSUPPORTED_STRING;
369372
}

0 commit comments

Comments
 (0)