Merge pull request apache#6988 from pepness/glassfish-8.0.0

Add support for Jakarta EE 11

- Add support for GlassFish 8
- Add support for Jakarta EE 11
  - Add xsd, mdd, and xml files for Jakarta EE 11
  - Add support for CDI 4.1
  - Add support for JSP 4.0
  - Add support for Servlet 6.1
  - Add support for Validation 3.1 (with Constraint 3.1)
  - Add support for JSF 4.1
  - Add support for Persistence 3.2
  - Add support for JPA 3.2
- Add Jakarta EE 11 support for GlassFish
- Add Jakarta EE 11 support for Gradle projects
- Add Jakarta EE 11 support for Maven projects
- Add Jakarta EE 11 support for Payara, Tomcat, and WildFly servers
- Add Jakarta EE 11 rat exclusions
- Add new Jakarta EE 11 modules `jakartaee11.api` and 
  `jakartaee11.platform`
- Refactor `versionToResourceFilesIndexes` method
- Add three new methods to Profile.class `isWebProfile`, `isAtMost` and
  `isFullProfile`
- Refactor some code and use new `isAtLeast()` method
- Change some variable names to be more descriptive
- Refactor code and avoid searching many times over a collection
- Add new method `isAtMost()` to JsfVersion.class
- Re-generate signature that failed in `ant check-sigtests`
- Use milestone 1 version for maven projects
- Bump GlassFish version to 8.0.0-M2
- Add missing Jakarta EE 10 logic for JSF 4.0
- Add missing support for Jakarta EE 10 in `RunTimeDDCatalog.java`
- Add missing test for GlassFish 7
- Add missing Jakarta EE 10 xsd files
- EJB 3.1 is not supported on Jakarta EE 9 and onward
- Add missing Jakarta EE 10 logic, licenses info, and xsd's files
- Add missing Jakarta EE 10 properties, schemas, and actions

contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JpaSupportImpl.java

@@ -39,7 +39,7 @@ public JpaSupportImpl(JBJ2eePlatformFactory.J2eePlatformImplImpl platformImpl) {
     public JpaProvider getDefaultProvider() {
         String defaultProvider = platformImpl.getDefaultJpaProvider();
         boolean jpa2 = platformImpl.isJpa2Available();
-        return JpaProviderFactory.createJpaProvider(defaultProvider, true, true, jpa2, false, false, false, false);
+        return JpaProviderFactory.createJpaProvider(defaultProvider, true, true, jpa2, false, false, false, false, false);
     }
 
     @Override
@@ -48,13 +48,16 @@ public Set<JpaProvider> getProviders() {
         boolean jpa2 = platformImpl.isJpa2Available();
         Set<JpaProvider> providers = new HashSet<JpaProvider>();
         if (platformImpl.containsPersistenceProvider(JBJ2eePlatformFactory.HIBERNATE_JPA_PROVIDER)) {
-            providers.add(JpaProviderFactory.createJpaProvider(JBJ2eePlatformFactory.HIBERNATE_JPA_PROVIDER, JBJ2eePlatformFactory.HIBERNATE_JPA_PROVIDER.equals(defaultProvider), true, jpa2, false, false));
+            providers.add(JpaProviderFactory.createJpaProvider(JBJ2eePlatformFactory.HIBERNATE_JPA_PROVIDER, 
+                    JBJ2eePlatformFactory.HIBERNATE_JPA_PROVIDER.equals(defaultProvider), true, jpa2, false, false, false, false, false));
         }
         if (platformImpl.containsPersistenceProvider(JBJ2eePlatformFactory.TOPLINK_JPA_PROVIDER)) {
-            providers.add(JpaProviderFactory.createJpaProvider(JBJ2eePlatformFactory.TOPLINK_JPA_PROVIDER, JBJ2eePlatformFactory.TOPLINK_JPA_PROVIDER.equals(defaultProvider), true, false, false, false));
+            providers.add(JpaProviderFactory.createJpaProvider(JBJ2eePlatformFactory.TOPLINK_JPA_PROVIDER, 
+                    JBJ2eePlatformFactory.TOPLINK_JPA_PROVIDER.equals(defaultProvider), true, false, false, false, false, false, false));
         }
         if (platformImpl.containsPersistenceProvider(JBJ2eePlatformFactory.KODO_JPA_PROVIDER)) {
-            providers.add(JpaProviderFactory.createJpaProvider(JBJ2eePlatformFactory.KODO_JPA_PROVIDER, JBJ2eePlatformFactory.KODO_JPA_PROVIDER.equals(defaultProvider), true, false, false, false));
+            providers.add(JpaProviderFactory.createJpaProvider(JBJ2eePlatformFactory.KODO_JPA_PROVIDER, 
+                    JBJ2eePlatformFactory.KODO_JPA_PROVIDER.equals(defaultProvider), true, false, false, false, false, false, false));
         }
         return providers;
     }

contrib/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/j2ee/JpaSupportImpl.java

@@ -39,19 +39,19 @@ public JpaSupportImpl(WLJ2eePlatformFactory.J2eePlatformImplImpl platformImpl) {
     public JpaProvider getDefaultProvider() {
         String defaultProvider = platformImpl.getDefaultJpaProvider();
         return JpaProviderFactory.createJpaProvider(defaultProvider, true, true,
-                platformImpl.isJpa2Available(), platformImpl.isJpa21Available(), false);
+                platformImpl.isJpa2Available(), platformImpl.isJpa21Available(), false, false, false, false);
     }
 
     @Override
     public Set<JpaProvider> getProviders() {
         String defaultProvider = platformImpl.getDefaultJpaProvider();
         Set<JpaProvider> providers = new HashSet<JpaProvider>();
         providers.add(JpaProviderFactory.createJpaProvider(WLJ2eePlatformFactory.OPENJPA_JPA_PROVIDER,
-                WLJ2eePlatformFactory.OPENJPA_JPA_PROVIDER.equals(defaultProvider), true, false, false, false));
+                WLJ2eePlatformFactory.OPENJPA_JPA_PROVIDER.equals(defaultProvider), true, false, false, false, false, false, false));
         providers.add(JpaProviderFactory.createJpaProvider(
                 WLJ2eePlatformFactory.ECLIPSELINK_JPA_PROVIDER,
                 WLJ2eePlatformFactory.ECLIPSELINK_JPA_PROVIDER.equals(defaultProvider), 
-                true, platformImpl.isJpa2Available(), platformImpl.isJpa21Available(), false));
+                true, platformImpl.isJpa2Available(), platformImpl.isJpa21Available(), false, false, false, false));
         return providers;
     }
 

enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties

@@ -179,6 +179,7 @@ STR_709_SERVER_NAME=GlassFish Server 7.0.9
 STR_7010_SERVER_NAME=GlassFish Server 7.0.10
 STR_7011_SERVER_NAME=GlassFish Server 7.0.11
 STR_7012_SERVER_NAME=GlassFish Server 7.0.12
+STR_800_SERVER_NAME=GlassFish Server 8.0.0
 
 # CommonServerSupport.java
 MSG_FLAKEY_NETWORK=<html>Network communication problem<br/>Could not establish \

enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java

@@ -69,6 +69,7 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
     public static final String JAKARTAEE9_DEPLOYER_FRAGMENT = "deployer:gfv6ee9";
     public static final String JAKARTAEE91_DEPLOYER_FRAGMENT = "deployer:gfv610ee9";
     public static final String JAKARTAEE10_DEPLOYER_FRAGMENT = "deployer:gfv700ee10";
+    public static final String JAKARTAEE11_DEPLOYER_FRAGMENT = "deployer:gfv800ee11";
     public static final String EE6WC_DEPLOYER_FRAGMENT = "deployer:gfv3ee6wc"; // NOI18N
     public static final String PRELUDE_DEPLOYER_FRAGMENT = "deployer:gfv3"; // NOI18N
     private static String EE6_INSTANCES_PATH = "/GlassFishEE6/Instances"; // NOI18N
@@ -78,6 +79,7 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
     private static String JAKARTAEE9_INSTANCES_PATH = "/GlassFishJakartaEE9/Instances"; // NOI18N
     private static String JAKARTAEE91_INSTANCES_PATH = "/GlassFishJakartaEE91/Instances"; // NOI18N
     private static String JAKARTAEE10_INSTANCES_PATH = "/GlassFishJakartaEE10/Instances"; // NOI18N
+    private static String JAKARTAEE11_INSTANCES_PATH = "/GlassFishJakartaEE11/Instances"; // NOI18N
     private static String EE6WC_INSTANCES_PATH = "/GlassFishEE6WC/Instances"; // NOI18N
 
     public static String PRELUDE_DEFAULT_NAME = "GlassFish_v3_Prelude"; //NOI18N
@@ -102,11 +104,13 @@ public static GlassfishInstanceProvider getProvider() {
                             new String[]{EE6_DEPLOYER_FRAGMENT, EE6WC_DEPLOYER_FRAGMENT, 
                                     EE7_DEPLOYER_FRAGMENT, EE8_DEPLOYER_FRAGMENT, 
                                     JAKARTAEE8_DEPLOYER_FRAGMENT, JAKARTAEE9_DEPLOYER_FRAGMENT,
-                                    JAKARTAEE91_DEPLOYER_FRAGMENT, JAKARTAEE10_DEPLOYER_FRAGMENT},
+                                    JAKARTAEE91_DEPLOYER_FRAGMENT, JAKARTAEE10_DEPLOYER_FRAGMENT,
+                                    JAKARTAEE11_DEPLOYER_FRAGMENT},
                             new String[]{EE6_INSTANCES_PATH, EE6WC_INSTANCES_PATH, 
                                     EE7_INSTANCES_PATH, EE8_INSTANCES_PATH, 
                                     JAKARTAEE8_INSTANCES_PATH, JAKARTAEE9_INSTANCES_PATH,
-                                    JAKARTAEE91_INSTANCES_PATH, JAKARTAEE10_INSTANCES_PATH},
+                                    JAKARTAEE91_INSTANCES_PATH, JAKARTAEE10_INSTANCES_PATH,
+                                    JAKARTAEE11_INSTANCES_PATH},
                             null,
                             true,
                             new String[]{"--nopassword"}, // NOI18N

enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java

@@ -422,6 +422,17 @@ public enum ServerDetails {
         "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.12/glassfish-7.0.12.zip", // NOI18N
         "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.12/glassfish-7.0.12.zip", // NOI18N
         "http://www.eclipse.org/legal/epl-2.0" //NOI18N
+    ),
+
+    /**
+     * details for an instance of GlassFish Server 8.0.0
+     */
+    GLASSFISH_SERVER_8_0_0(NbBundle.getMessage(ServerDetails.class, "STR_800_SERVER_NAME", new Object[]{}), // NOI18N
+        GlassfishInstanceProvider.JAKARTAEE11_DEPLOYER_FRAGMENT,
+        GlassFishVersion.GF_8_0_0,
+        "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M2/glassfish-8.0.0-M2.zip", // NOI18N
+        "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M2/glassfish-8.0.0-M2.zip", // NOI18N
+        "http://www.eclipse.org/legal/epl-2.0" //NOI18N
     );
 
     /**

enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java

@@ -84,7 +84,10 @@ private static int autoregisterGlassFishInstance(String clusterDirValue, String
         String deployer = "deployer:gfv3ee6";
         String defaultDisplayNamePrefix = "GlassFish Server ";
         GlassFishVersion version = ServerUtils.getServerVersion(glassfishRoot);
-        if (GlassFishVersion.ge(version, GlassFishVersion.GF_7_0_0)) {
+        if (GlassFishVersion.ge(version, GlassFishVersion.GF_8_0_0)) {
+            deployer = "deployer:gfv800ee11";
+            config = "GlassFishJakartaEE11/Instances";
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_7_0_0)) {
             deployer = "deployer:gfv700ee10";
             config = "GlassFishJakartaEE10/Instances";
         } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {

enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties

@@ -181,6 +181,9 @@ STR_7010_SERVER_NAME=GlassFish Server 7.0.10
 STR_7011_SERVER_NAME=GlassFish Server 7.0.11
 STR_7012_SERVER_NAME=GlassFish Server 7.0.12
 
+STR_V8_FAMILY_NAME=GlassFish Server
+STR_800_SERVER_NAME=GlassFish Server 8.0.0
+
 LBL_SELECT_BITS=Select
 LBL_ChooseOne=Choose server to download:
 

enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java

@@ -75,7 +75,14 @@ public static GlassfishWizardProvider createJakartaEe91() {
     public static GlassfishWizardProvider createJakartaEe10() {
         return new GlassfishWizardProvider(
                 org.openide.util.NbBundle.getMessage(GlassfishWizardProvider.class,
-                        "STR_V7_FAMILY_NAME", new Object[]{}) // NOI18N
+                "STR_V7_FAMILY_NAME", new Object[]{}) // NOI18N
+        );
+    }
+
+    public static GlassfishWizardProvider createJakartaEe11() {
+        return new GlassfishWizardProvider(
+                org.openide.util.NbBundle.getMessage(GlassfishWizardProvider.class,
+                "STR_V8_FAMILY_NAME", new Object[]{}) // NOI18N
         );
     }
 

enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java

@@ -112,6 +112,12 @@ public static ServerUtilities getJakartaEe10Utilities() {
         return null == gip ? null : new ServerUtilities(gip,
                 GlassfishWizardProvider.createJakartaEe10());
     }
+
+    public static ServerUtilities getJakartaEe11Utilities() {
+        GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();
+        return null == gip ? null : new ServerUtilities(gip,
+                GlassfishWizardProvider.createJakartaEe11());
+    }
 
 //    public static ServerUtilities getEe6WCUtilities() {
 //        GlassfishInstanceProvider gip = GlassfishInstanceProvider.getProvider();

enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistrationTest.java

@@ -28,6 +28,38 @@
  */
 public class AutomaticRegistrationTest {
 
+    @Test
+    public void testRegistrationGF8() {
+        GlassFishVersion version = GlassFishVersion.GF_8_0_0;
+        if (GlassFishVersion.ge(version, GlassFishVersion.GF_8_0_0)) {
+            assertTrue("Success!", true);
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
+            fail("GF_6");
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+            fail("GF_5_1_0");
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+            fail("GF_5");
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+            fail("GF_3_1");
+        }
+    }
+
+    @Test
+    public void testRegistrationGF7() {
+        GlassFishVersion version = GlassFishVersion.GF_7_0_11;
+        if (GlassFishVersion.ge(version, GlassFishVersion.GF_7_0_0)) {
+            assertTrue("Success!", true);
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
+            fail("GF_6");
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+            fail("GF_5_1_0");
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+            fail("GF_5");
+        } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+            fail("GF_3_1");
+        }
+    }
+
     @Test
     public void testRegistrationGF625() {
         GlassFishVersion version = GlassFishVersion.GF_6_2_5;

enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/AppClientVersion.java

@@ -81,6 +81,13 @@ public final class AppClientVersion extends J2EEBaseVersion {
         "10.0", 10000,	// NOI18N
         "10.0", 10000	// NOI18N
         );
+
+    /** Represents application-client version 11.0
+     */
+    public static final AppClientVersion APP_CLIENT_11_0 = new AppClientVersion(
+        "11.0", 11000,	// NOI18N
+        "11.0", 11000	// NOI18N
+        );
     /** -----------------------------------------------------------------------
      *  Implementation
      */
@@ -122,6 +129,8 @@ public static AppClientVersion getAppClientVersion(String version) {
             result = APP_CLIENT_9_0;
         } else if(APP_CLIENT_10_0.toString().equals(version)) {
             result = APP_CLIENT_10_0;
+        } else if(APP_CLIENT_11_0.toString().equals(version)) {
+            result = APP_CLIENT_11_0;
         }
 
         return result;

enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ApplicationVersion.java

@@ -81,6 +81,13 @@ public final class ApplicationVersion extends J2EEBaseVersion {
         "10.0", 10000,	// NOI18N
         "10.0", 10000	// NOI18N
         );
+
+    /** Represents application version 11.0
+     */
+    public static final ApplicationVersion APPLICATION_11_0 = new ApplicationVersion(
+        "11.0", 11000,	// NOI18N
+        "11.0", 11000	// NOI18N
+        );
 
     /** -----------------------------------------------------------------------
      *  Implementation

enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/EjbJarVersion.java

@@ -81,6 +81,14 @@ public final class EjbJarVersion extends J2EEBaseVersion {
             "4.0", 4000, // NOI18N
             "9.0", 9000 // NOI18N
     );
+
+    /**
+     * Represents ejbjar version 4.0.1
+     */
+    public static final EjbJarVersion EJBJAR_4_0_1 = new EjbJarVersion(
+            "4.0.1", 4010, // NOI18N
+            "10.0", 10000 // NOI18N
+    );
     /** -----------------------------------------------------------------------
      *  Implementation
      */

enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java

@@ -70,7 +70,7 @@
 import org.openide.util.RequestProcessor;
 
 /**
- * Basic Java EE server configuration API support for V2, V3 and V4 plugins.
+ * Basic Java/Jakarta EE server configuration API support for V2-V8 plugins.
  * <p/>
  * @author Peter Williams, Tomas Kraus
  */
@@ -85,7 +85,7 @@ public abstract class GlassfishConfiguration implements
     ////////////////////////////////////////////////////////////////////////////
 
     /** GlassFish Java EE common module Logger. */
-    private static final Logger LOGGER = Logger.getLogger("glassfish-eecommon");
+    private static final Logger LOGGER = Logger.getLogger(GlassfishConfiguration.class.getName());
 
     /** GlassFish resource file suffix is {@code .xml}. */
     private static final String RESOURCE_FILES_SUFFIX = ".xml";
@@ -136,19 +136,7 @@ private static int[] versionToResourceFilesIndexes(
         if (version == null) {
             return new int[]{0,1};
         }
-        // glassfish-resources.xml for v7
-        if (GlassFishVersion.ge(version, GlassFishVersion.GF_7_0_0)) {
-            return new int[]{0};
-        }
-        // glassfish-resources.xml for v6
-        if (GlassFishVersion.ge(version, GlassFishVersion.GF_6) || GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
-            return new int[]{0};
-        }
-        // glassfish-resources.xml for v5
-        if (GlassFishVersion.ge(version, GlassFishVersion.GF_5) || GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
-            return new int[]{0};
-        }
-        // glassfish-resources.xml for v4
+        // glassfish-resources.xml for v4 and onwards
         if (GlassFishVersion.ge(version, GlassFishVersion.GF_4)) {
             return new int[]{0};
         }
@@ -515,7 +503,8 @@ void internalSetAppServerVersion(ASDDVersion asVersion) {
         "gfv510ee8",
         "gfv6ee9",
         "gfv610ee9",
-        "gfv700ee10"
+        "gfv700ee10",
+        "gfv800ee11"
     };
 
     protected ASDDVersion getTargetAppServerVersion() {
@@ -567,7 +556,13 @@ static ASDDVersion getInstalledAppServerVersionFromDirectory(File asInstallFolde
         boolean geGF5 = false;
         boolean geGF6 = false;
         boolean geGF7 = false;
+        boolean geGF8 = false;
         if(schemaFolder.exists()){
+            if(new File(schemaFolder, "jakartaee11.xsd").exists() &&
+                    new File(dtdFolder, "glassfish-web-app_3_0-1.dtd").exists()){
+              geGF8 = true;
+              return ASDDVersion.GLASSFISH_8;
+            }
             if(new File(schemaFolder, "jakartaee10.xsd").exists() &&
                     new File(dtdFolder, "glassfish-web-app_3_0-1.dtd").exists()){
               geGF7 = true;
@@ -584,7 +579,7 @@ static ASDDVersion getInstalledAppServerVersionFromDirectory(File asInstallFolde
               return ASDDVersion.GLASSFISH_5_1;
             }
         }
-        if (!geGF5 && !geGF6 && !geGF7 && dtdFolder.exists()) {
+        if (!geGF5 && !geGF6 && !geGF7 && !geGF8 && dtdFolder.exists()) {
             if (new File(dtdFolder, "glassfish-web-app_3_0-1.dtd").exists()) {
                 return ASDDVersion.SUN_APPSERVER_10_1;
             }

enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2eeModuleHelper.java

@@ -202,6 +202,12 @@ protected ASDDVersion getMinASVersion(String j2eeModuleVersion, ASDDVersion defa
                 result = ASDDVersion.SUN_APPSERVER_10_0;
             } else if (ServletVersion.SERVLET_4_0.equals(servletVersion)) {
                 result = ASDDVersion.GLASSFISH_5_1;
+            } else if (ServletVersion.SERVLET_5_0.equals(servletVersion)) {
+                result = ASDDVersion.GLASSFISH_6;
+            } else if (ServletVersion.SERVLET_6_0.equals(servletVersion)) {
+                result = ASDDVersion.GLASSFISH_7;
+            } else if (ServletVersion.SERVLET_6_1.equals(servletVersion)) {
+                result = ASDDVersion.GLASSFISH_8;
             }
             return result;
         }
@@ -236,6 +242,8 @@ protected ASDDVersion getMinASVersion(String j2eeModuleVersion, ASDDVersion defa
                 result = ASDDVersion.GLASSFISH_6;
             } else if (ServletVersion.SERVLET_6_0.equals(servletVersion)) {
                 result = ASDDVersion.GLASSFISH_7;
+            } else if (ServletVersion.SERVLET_6_1.equals(servletVersion)) {
+                result = ASDDVersion.GLASSFISH_8;
             }
             return result;
         }
@@ -275,6 +283,8 @@ protected ASDDVersion getMinASVersion(String j2eeModuleVersion, ASDDVersion defa
                 result = ASDDVersion.GLASSFISH_5_1;
             } else if (EjbJarVersion.EJBJAR_4_0.equals(ejbJarVersion)) {
                 result = ASDDVersion.GLASSFISH_7;
+            } else if (EjbJarVersion.EJBJAR_4_0_1.equals(ejbJarVersion)) {
+                result = ASDDVersion.GLASSFISH_8;
             }
             return result;
         }
@@ -314,6 +324,8 @@ protected ASDDVersion getMinASVersion(String j2eeModuleVersion, ASDDVersion defa
                 result = ASDDVersion.GLASSFISH_6;
             } else if (ApplicationVersion.APPLICATION_10_0.equals(applicationVersion)) {
                 result = ASDDVersion.GLASSFISH_7;
+            } else if (ApplicationVersion.APPLICATION_11_0.equals(applicationVersion)) {
+                result = ASDDVersion.GLASSFISH_8;
             }
             return result;
         }
@@ -353,6 +365,8 @@ protected ASDDVersion getMinASVersion(String j2eeModuleVersion, ASDDVersion defa
                 result = ASDDVersion.GLASSFISH_6;
             } else if (AppClientVersion.APP_CLIENT_10_0.equals(appClientVersion)) {
                 result = ASDDVersion.GLASSFISH_7;
+            } else if (AppClientVersion.APP_CLIENT_11_0.equals(appClientVersion)) {
+                result = ASDDVersion.GLASSFISH_8;
             }
             return result;
         }

enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java

@@ -81,6 +81,13 @@ public final class ServletVersion extends J2EEBaseVersion {
         "6.0", 6000,	// NOI18N
         "10.0", 10000	// NOI18N
         );
+
+    /** Represents servlet version 6.1
+     */
+    public static final ServletVersion SERVLET_6_1 = new ServletVersion(
+        "6.1", 6100,	// NOI18N
+        "11.0", 11000	// NOI18N
+        );
 
     /** -----------------------------------------------------------------------
      *  Implementation