From c930b7f90af19e2cfa11371d25d197e6ce045ae6 Mon Sep 17 00:00:00 2001 From: Reza Rahman Date: Sat, 15 Jun 2024 18:42:23 -0400 Subject: [PATCH 1/2] Runtime updates. --- README.md | 3 +-- archetype/README.md | 3 +-- .../resources/archetype-resources/Dockerfile | 18 +++++++++--------- .../java/jakarta/hello/HelloApplication.java | 2 +- ui/pom.xml | 2 ++ .../eclipse/starter/ui/RestApplication.java | 2 +- ui/src/main/webapp/index.xhtml | 1 - 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 1b22ea3b..478c330c 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,7 @@ In order to run the Maven Archetype and generate a sample Jakarta EE project, pl mvn archetype:generate -DarchetypeGroupId="org.eclipse.starter" -DarchetypeArtifactId="jakarta-starter" ``` -If you use the defaults, this will generate the Jakarta EE project under a directory named `jakartaee-hello-world`. The README.md file -under that directory will contain instructions on how to run the sample. +If you use the defaults, this will generate the Jakarta EE project under a directory named `jakartaee-hello-world`. The README.md file under that directory will contain instructions on how to run the sample. If desired, you can easily use the Maven Archetype from a Maven capable IDE such as [Eclipse](https://www.eclipse.org/ide). The generated starter code is simply Maven projects. You can easily load, explore and run the code in a Maven capable IDE such as [Eclipse](https://www.eclipse.org/ide). diff --git a/archetype/README.md b/archetype/README.md index 18019f1c..6156ac65 100644 --- a/archetype/README.md +++ b/archetype/README.md @@ -18,8 +18,7 @@ In order to run the Maven Archetype and generate a sample Jakarta EE project, pl mvn archetype:generate -DarchetypeGroupId="org.eclipse.starter" -DarchetypeArtifactId="jakarta-starter" ``` -If you use the defaults, this will generate the Jakarta EE project under a directory named `jakartaee-hello-world`. The README.md file -under that directory will contain instructions on how to run the sample. +If you use the defaults, this will generate the Jakarta EE project under a directory named `jakartaee-hello-world`. The README.md file under that directory will contain instructions on how to run the sample. If desired, you can easily use the Maven Archetype from a Maven capable IDE such as [Eclipse](https://www.eclipse.org/ide). The generated starter code is simply Maven projects. You can easily load, explore and run the code in a Maven capable IDE such as [Eclipse](https://www.eclipse.org/ide). diff --git a/archetype/src/main/resources/archetype-resources/Dockerfile b/archetype/src/main/resources/archetype-resources/Dockerfile index 301ee471..e7ce1c88 100644 --- a/archetype/src/main/resources/archetype-resources/Dockerfile +++ b/archetype/src/main/resources/archetype-resources/Dockerfile @@ -1,11 +1,11 @@ #if (${jakartaVersion} == '8') #if (${runtime} == 'tomee') #if (${javaVersion} == '8') -#set ($baseImage = "tomee:jre8-alpine-plume") +#set ($baseImage = "tomee:8-jre8-plume") #elseif (${javaVersion} == '11') -#set ($baseImage = "tomee:jre11-alpine-plume") +#set ($baseImage = "tomee:8-jre11-plume") #else -#set ($baseImage = "tomee:alpine-plume") +#set ($baseImage = "tomee:8-jre17-plume") #end #set ($deployDirectory = "/usr/local/tomee/webapps/") #elseif (${runtime} == 'payara') @@ -42,23 +42,23 @@ #else #if (${runtime} == 'tomee') #if (${javaVersion} == '11') -#set ($baseImage = "tomee:9-jre11-alpine-plume") +#set ($baseImage = "tomee:9-jre11-plume") #else -#set ($baseImage = "tomee:9-alpine-plume") +#set ($baseImage = "tomee:9-jre17-plume") #end #set ($deployDirectory = "/usr/local/tomee/webapps/") #elseif (${runtime} == 'payara') #if (${javaVersion} == '17') #if (${profile} == 'full') -#set ($baseImage = "payara/server-full:6.2024.1-jdk17") +#set ($baseImage = "payara/server-full:6.2024.5-jdk17") #else -#set ($baseImage = "payara/server-web:6.2024.1-jdk17") +#set ($baseImage = "payara/server-web:6.2024.5-jdk17") #end #else #if (${profile} == 'full') -#set ($baseImage = "payara/server-full:6.2024.1") +#set ($baseImage = "payara/server-full:6.2024.5") #else -#set ($baseImage = "payara/server-web:6.2024.1") +#set ($baseImage = "payara/server-web:6.2024.5") #end #end #set ($deployDirectory = "$DEPLOY_DIR") diff --git a/archetype/src/main/resources/archetype-resources/src/main/java/jakarta/hello/HelloApplication.java b/archetype/src/main/resources/archetype-resources/src/main/java/jakarta/hello/HelloApplication.java index 7b1b2c74..ad657736 100644 --- a/archetype/src/main/resources/archetype-resources/src/main/java/jakarta/hello/HelloApplication.java +++ b/archetype/src/main/resources/archetype-resources/src/main/java/jakarta/hello/HelloApplication.java @@ -5,5 +5,5 @@ @ApplicationPath("rest") public class HelloApplication extends Application { - + // Needed to enable Jakarta REST and specify path. } diff --git a/ui/pom.xml b/ui/pom.xml index c36a1805..dd94052d 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -177,6 +177,8 @@ standalone-full.xml + + com.microsoft.azure azure-webapp-maven-plugin diff --git a/ui/src/main/java/org/eclipse/starter/ui/RestApplication.java b/ui/src/main/java/org/eclipse/starter/ui/RestApplication.java index 823f08da..499b837b 100644 --- a/ui/src/main/java/org/eclipse/starter/ui/RestApplication.java +++ b/ui/src/main/java/org/eclipse/starter/ui/RestApplication.java @@ -5,5 +5,5 @@ @ApplicationPath("/api") public class RestApplication extends Application { - + // Otherwise empty, needed to enable Jakarta REST and specify path. } diff --git a/ui/src/main/webapp/index.xhtml b/ui/src/main/webapp/index.xhtml index 7e2f81f2..91b4d880 100644 --- a/ui/src/main/webapp/index.xhtml +++ b/ui/src/main/webapp/index.xhtml @@ -113,7 +113,6 @@ icon="pi pi-arrow-down" action="#{project.generate}"/> - From 97387219bf3c8a553c67936c8a0f3cdc18777175 Mon Sep 17 00:00:00 2001 From: Reza Rahman Date: Sat, 15 Jun 2024 18:57:46 -0400 Subject: [PATCH 2/2] Update runtimes and Maven dependencies. --- .../resources/archetype-resources/pom.xml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml index 6065d7e1..269c29da 100644 --- a/archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetype/src/main/resources/archetype-resources/pom.xml @@ -27,17 +27,17 @@ #set ($glassfishUrl = "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/5.1.0/glassfish-5.1.0.zip") #end #else -#set ($payaraVersion = "6.2024.1") -#set ($tomeeVersion = "9.1.1") +#set ($payaraVersion = "6.2024.5") +#set ($tomeeVersion = "9.1.3") #set ($glassfishContainerId = "glassfish7x") #if (${profile} == 'web') -#set ($glassfishUrl = "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/web/7.0.12/web-7.0.12.zip") +#set ($glassfishUrl = "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/web/7.0.15/web-7.0.15.zip") #else -#set ($glassfishUrl = "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.12/glassfish-7.0.12.zip") +#set ($glassfishUrl = "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.15/glassfish-7.0.15.zip") #end #end #if (${jakartaVersion} == '10') -#set ($wildflyVersion = "30.0.1.Final") +#set ($wildflyVersion = "32.0.1.Final") #else #set ($wildflyVersion = "26.1.3.Final") #end @@ -74,22 +74,22 @@ #if (${runtime} == 'wildfly') ${wildflyVersion} #end - 3.11.0 + 3.13.0 3.4.0 #if ((${runtime} == 'glassfish') || ((${runtime} == 'payara') && (${profile} == 'full'))) - 1.10.11 + 1.10.13 #end #if (${runtime} == 'tomee') - 9.1.1 + 9.1.3 #end #if ((${runtime} == 'payara') && (${profile} != 'full')) - 2.0 + 2.3 #end #if (${runtime} == 'wildfly') - 4.2.1.Final + 5.0.0.Final #end #if (${runtime} == 'open-liberty') - 3.10 + 3.10.3 #end