From ae5fc103c6f17541263fae352fb4d593b7eb9a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Contreras?= <pepness@apache.org>
Date: Sat, 25 Jan 2025 10:46:23 -0600
Subject: [PATCH] -Add support for Java SE 25 for Tomcat, TomEE, and GlassFish
 -TomEE 10 runs on Java SE 17 and later -Tomcat 11 runs on Java SE 17 and
 later

---
 .../tooling/server/config/JavaSEPlatform.java    |  4 +++-
 .../modules/tomcat5/j2ee/TomcatPlatformImpl.java | 16 +++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java
index 205a32f1c3f1..c7a621ca76fa 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java
+++ b/enterprise/glassfish.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
index c0524e950475..efdce81f97aa 100644
--- 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);