Merge pull request #8208 from pepness/tomee-10

Add support for Java SE 25 for Tomcat, TomEE, and GlassFish - Tomcat 11 runs on Java SE 17 and later - TomEE 10 runs on Java SE 17 and later - Add enum for Java SE 25 on GlassFish tooling
apache · Feb 2, 2025 · dd8f6fd · dd8f6fd
2 parents e38f618 + ae5fc10
commit dd8f6fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/...fish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java b/...fish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java
@@ -75,7 +75,9 @@ public enum JavaSEPlatform {
     /** JavaSE 23. */
     v23,
     /** JavaSE 24. */
-    v24;
+    v24,
+    /** JavaSE 25. */
+    v25;
 
     ////////////////////////////////////////////////////////////////////////////
     // Class attributes                                                       //

diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
@@ -556,11 +556,13 @@ public Set<String> getSupportedJavaPlatformVersions() {
         if (manager.isTomEE()) {
             switch (manager.getTomEEVersion()) {
                 case TOMEE_100:
+                    versions = versionRange(17, 25);
+                    break;
                 case TOMEE_90:
-                    versions = versionRange(11, 24);
+                    versions = versionRange(11, 25);
                     break;
                 case TOMEE_80:
-                    versions = versionRange(8, 24);
+                    versions = versionRange(8, 25);
                     break;
                 case TOMEE_71:
                 case TOMEE_70:
@@ -577,20 +579,20 @@ public Set<String> getSupportedJavaPlatformVersions() {
         } else {
             switch (manager.getTomcatVersion()) {
                 case TOMCAT_110:
-                    versions = versionRange(21, 24);
+                    versions = versionRange(17, 25);
                     break;
                 case TOMCAT_101:
-                    versions = versionRange(11, 24);
+                    versions = versionRange(11, 25);
                     break;
                 case TOMCAT_100:
                 case TOMCAT_90:
-                    versions = versionRange(8, 24);
+                    versions = versionRange(8, 25);
                     break;
                 case TOMCAT_80:
-                    versions = versionRange(7, 24);
+                    versions = versionRange(7, 25);
                     break;
                 case TOMCAT_70:
-                    versions = versionRange(6, 24);
+                    versions = versionRange(6, 25);
                     break;
                 case TOMCAT_60:
                     versions = versionRange(5, 8);