Expose EE 10 selection for Open Liberty (#251)

* Expose EE 10 selection for Open Liberty Signed-off-by: Scott Kurz <[email protected]> * For Open Liberty avoid plugin parm config to allow CLI override Signed-off-by: Scott Kurz <[email protected]> --------- Signed-off-by: Scott Kurz <[email protected]>
eclipse-ee4j · Jun 4, 2023 · 93ec884 · 93ec884
1 parent 7379be4
commit 93ec884
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 14 deletions.
diff --git a/archetype/src/main/resources/META-INF/archetype-post-generate.groovy b/archetype/src/main/resources/META-INF/archetype-post-generate.groovy
@@ -67,10 +67,6 @@ private validateInput(jakartaVersion, profile, javaVersion, runtime, File output
         }
     }
 
-    if (runtime.equalsIgnoreCase("open-liberty") && (jakartaVersion == '10')) {
-        FileUtils.forceDelete(outputDirectory)
-        throw new RuntimeException("Failed, Open Liberty does not yet support Jakarta EE 10")
-    }
 }
 
 private generateRuntime(runtime, jakartaVersion, docker, File outputDirectory) {

diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -214,9 +214,6 @@
 				<groupId>io.openliberty.tools</groupId>
 				<artifactId>liberty-maven-plugin</artifactId>
 				<version>${liberty-plugin.version}</version>
-				<configuration>
-					<libertyRuntimeVersion>RELEASE</libertyRuntimeVersion>
-				</configuration>
 			</plugin>
 #end
 		</plugins>

diff --git a/ui/src/main/java/org/eclipse/starter/ui/Project.java b/ui/src/main/java/org/eclipse/starter/ui/Project.java
@@ -84,7 +84,6 @@ public Project() {
 		shuffledRuntimes.forEach(r -> runtimes.put(r, new SelectItem(r, RUNTIMES.get(r))));
 
 		runtimes.get("tomee").setDisabled(true); // EE 10 is the default. TomEE needs to be disabled.
-		runtimes.get("open-liberty").setDisabled(true); // EE 10 is the default. Open Liberty needs to be disabled.
 	}
 
 	public Collection<SelectItem> getJakartaVersions() {
@@ -158,7 +157,6 @@ public void onJakartaVersionChange() {
 				runtimes.get("tomee").setDisabled(false);
 			}
 
-			runtimes.get("open-liberty").setDisabled(false);
 
 			profiles.get("core").setDisabled(true);
 
@@ -170,7 +168,6 @@ public void onJakartaVersionChange() {
 		} else {
 			javaVersions.get("8").setDisabled(true);
 			runtimes.get("tomee").setDisabled(true);
-			runtimes.get("open-liberty").setDisabled(true);
 
 			if (!runtime.equals("glassfish")) {
 				profiles.get("core").setDisabled(false);
@@ -222,7 +219,7 @@ public void onJavaVersionChange() {
 			jakartaVersions.get("10").setDisabled(true);
 			profiles.get("core").setDisabled(true);
 		} else {
-			if (!runtime.equals("tomee") && !runtime.equals("open-liberty")) {
+			if (!runtime.equals("tomee")) {
 				jakartaVersions.get("10").setDisabled(false);
 			}
 		}
@@ -284,8 +281,6 @@ public void onRuntimeChange() {
 			if ((jakartaVersion != 8) && (javaVersion == 8)) {
 				javaVersion = 11;
 			}
-		} else if (runtime.equals("open-liberty")) {
-			jakartaVersions.get("10").setDisabled(true);
 		} else if (runtime.equals("wildfly")) {
 			jakartaVersions.get("9.1").setDisabled(true);
 			jakartaVersions.get("9").setDisabled(true);

diff --git a/ui/src/main/webapp/index.xhtml b/ui/src/main/webapp/index.xhtml
@@ -72,7 +72,7 @@
                 <p:ajax event="change" listener="#{project.onRuntimeChange}"
                         process="@form" update="@form" />
               </p:selectOneRadio>
-              <h:outputText styleClass="footnote" value="TomEE requires Web Profile, TomEE and Open Liberty require Jakarta EE below 10, GlassFish requires no Docker support and Web Profile or the Jakarta EE Platform, WildFly requires Jakarta EE 8 or 10."/>
+              <h:outputText styleClass="footnote" value="TomEE requires Web Profile and Jakarta EE below 10, GlassFish requires no Docker support and Web Profile or the Jakarta EE Platform, WildFly requires Jakarta EE 8 or 10."/>
             </p:column>
 
             <p:outputLabel for="@next" value="Docker support" />