Skip to content

Commit f0d9562

Browse files
authored
Merge pull request #8774 from pepness/javase-26
Add support for Java SE 26 for Tomcat, TomEE, and GlassFish - Tomcat 7-11 runs on Java SE 26 - TomEE 10 runs on Java SE 17 and later - TomEE 9-8 runs up to Java SE 23 - Add enum for Java SE 26 on GlassFish tooling (currently not supported by GlassFish)
2 parents 26f14c3 + a0d2484 commit f0d9562

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ public enum JavaSEPlatform {
7474
/** JavaSE 24. */
7575
v24,
7676
/** JavaSE 25. */
77-
v25;
77+
v25,
78+
/** JavaSE 26. */
79+
v26;
7880

7981
// Class attributes //
8082
/** GlassFish JavaEE platform enumeration length. */

enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -555,17 +555,19 @@ public Set<Profile> getSupportedProfiles() {
555555
public Set<String> getSupportedJavaPlatformVersions() {
556556
Set<String> versions = new HashSet<>(16);
557557

558-
// TomEE has different supported Java versions
558+
// TomEE has different supported Java versions.
559+
// The Java Security Manager (JSM) has been permanently disabled
560+
// as of JDK 24. Only TomEE 10+ will work with Java 24+.
559561
if (manager.isTomEE()) {
560562
switch (manager.getTomEEVersion()) {
561563
case TOMEE_100:
562-
versions = versionRange(17, 25);
564+
versions = versionRange(17, 26);
563565
break;
564566
case TOMEE_90:
565-
versions = versionRange(11, 25);
567+
versions = versionRange(11, 23);
566568
break;
567569
case TOMEE_80:
568-
versions = versionRange(8, 25);
570+
versions = versionRange(8, 23);
569571
break;
570572
case TOMEE_71:
571573
case TOMEE_70:
@@ -582,20 +584,20 @@ public Set<String> getSupportedJavaPlatformVersions() {
582584
} else {
583585
switch (manager.getTomcatVersion()) {
584586
case TOMCAT_110:
585-
versions = versionRange(17, 25);
587+
versions = versionRange(17, 26);
586588
break;
587589
case TOMCAT_101:
588-
versions = versionRange(11, 25);
590+
versions = versionRange(11, 26);
589591
break;
590592
case TOMCAT_100:
591593
case TOMCAT_90:
592-
versions = versionRange(8, 25);
594+
versions = versionRange(8, 26);
593595
break;
594596
case TOMCAT_80:
595-
versions = versionRange(7, 25);
597+
versions = versionRange(7, 26);
596598
break;
597599
case TOMCAT_70:
598-
versions = versionRange(6, 25);
600+
versions = versionRange(6, 26);
599601
break;
600602
case TOMCAT_60:
601603
versions = versionRange(5, 8);

0 commit comments

Comments
 (0)