Review updates

Author: jhanders34

.github/workflows/nightly.yml

@@ -922,7 +922,7 @@ jobs:
                   mvn archetype:generate -DinteractiveMode=false -DaskForDefaultPropertyValues=false -DarchetypeGroupId=org.eclipse.starter -DarchetypeArtifactId=jakarta-starter -DarchetypeVersion=2.8.0-SNAPSHOT -DjakartaVersion=11 -Dprofile=full -DjavaVersion=17 -Druntime=wildfly -DoutputDirectory=app/wildfly -Dgoals="clean package" | tee mvn_output.txt
 
                   MAVEN_EXIT_CODE=${PIPESTATUS[0]}
-                  ERROR_MESSAGE="only Payara currently supports Jakarta EE 11 in a stable release"
+                  ERROR_MESSAGE="WildFly does not support Jakarta EE 11"
                   if ! { [ $MAVEN_EXIT_CODE -ne 0 ] && grep -q "$ERROR_MESSAGE" mvn_output.txt; }; then
                       echo "Maven build did not fail, or the expected error message was not found. Test failed."
                       exit 1

archetype/src/main/resources/META-INF/archetype-post-generate.groovy

@@ -46,13 +46,6 @@ private validateInput(jakartaVersion, profile, javaVersion, runtime, docker, Fil
         throw new RuntimeException("Failed, valid Docker options are yes and no")
     }
 
-    // For now, this catch-all will simplify the rest of the validation.
-    // It should be evolved once more runtimes properly suppport Jakarta EE 11.
-    if ((jakartaVersion == '11') && (runtime != 'none') && (runtime != 'payara')) {
-        FileUtils.forceDelete(outputDirectory)
-        throw new RuntimeException("Failed, only Payara currently supports Jakarta EE 11 in a stable release")
-    }
-
     if ((profile == 'core') && (Double.valueOf(jakartaVersion) < 10)) {
         FileUtils.forceDelete(outputDirectory)
         throw new RuntimeException("Failed, the Core Profile is only supported for Jakarta EE 10 and above")
@@ -69,6 +62,11 @@ private validateInput(jakartaVersion, profile, javaVersion, runtime, docker, Fil
     }
 
     if (runtime == 'glassfish') {
+        if ((jakartaVersion == '11')) {
+            FileUtils.forceDelete(outputDirectory)
+            throw new RuntimeException("Failed, GlassFish does not support Jakarta EE 11")
+        }
+
         if (profile == 'core') {
             FileUtils.forceDelete(outputDirectory)
             throw new RuntimeException("Failed, GlassFish does not support the Core Profile")
@@ -127,6 +125,11 @@ private validateInput(jakartaVersion, profile, javaVersion, runtime, docker, Fil
     }
 
     if (runtime == 'wildfly') {
+        if ((jakartaVersion == '11')) {
+            FileUtils.forceDelete(outputDirectory)
+            throw new RuntimeException("Failed, WildFly does not support Jakarta EE 11")
+        }
+
         if ((jakartaVersion == '9') || (jakartaVersion == '9.1')) {
             FileUtils.forceDelete(outputDirectory)
             throw new RuntimeException("Failed, WildFly does not offer a stable release for Jakarta EE 9 or Jakarta EE 9.1")

archetype/src/main/resources/archetype-resources/src/main/liberty/config/server.xml

@@ -18,18 +18,12 @@
     #else
         <feature>webProfile-10.0</feature>
     #end
-#elseif (${jakartaVersion} == '11')
+#else
     #if (${profile} == 'full')
         <feature>jakartaee-11.0</feature>
     #else
         <feature>webProfile-11.0</feature>
     #end
-#else
-    #if (${profile} == 'full')
-        <feature>jakartaee-12.0</feature>
-    #else
-        <feature>webProfile-12.0</feature>
-    #end
 #end
     </featureManager>
     <basicRegistry id="defaultBasicRegistry" realm="BasicRealm">

ui/src/main/java/org/eclipse/starter/ui/Project.java

@@ -277,11 +277,7 @@ private void updateRuntimeEnabledStates() {
             runtimes.get("glassfish").setDisabled(false);
         }
 
-        if (jakartaVersion == 12) {
-            runtimes.get("open-liberty").setDisabled(true);
-        } else {
-            runtimes.get("open-liberty").setDisabled(false);
-        }
+        runtimes.get("open-liberty").setDisabled(false);
 
         if (jakartaVersion == 8 && javaVersion == 21) {
             // Payara 5 does not support Java SE 21.

ui/src/main/webapp/index.xhtml

@@ -31,10 +31,7 @@
                         </p:selectOneMenu>
                         <h:outputText
                                 styleClass="footnote"
-                                value="Jakarta EE 11 requires Java SE 17 or later."/>
-                        <h:outputText
-                                styleClass="footnote"
-                                value="Jakarta EE 10 requires Java SE 11 or later."/>
+                                value="Jakarta EE 11 requires Java SE 17 or later, Jakarta EE 10 requires Java SE 11 or later."/>
                     </p:column>
 
                     <p:column>
@@ -55,7 +52,7 @@
                         </p:selectOneMenu>
                         <h:outputText
                                 styleClass="footnote"
-                                value="Core Profile only available for Jakarta EE 10 and later."/>
+                                value="Core Profile is only available for Jakarta EE 10 and later."/>
                     </p:column>
 
                     <p:column>
@@ -76,10 +73,7 @@
                         </p:selectOneMenu>
                         <h:outputText
                                 styleClass="footnote"
-                                value="Java SE 11 requires Jakarta EE below 11."/>
-                        <h:outputText
-                                styleClass="footnote"
-                                value="Java SE 8 requires Jakarta EE below 10."/>
+                                value="Java SE 11 requires Jakarta EE 10 or earlier, Java SE 8 requires Jakarta EE 9.1 or earlier."/>
                     </p:column>
 
                     <p:column>