Merge pull request eclipse-ee4j#302 from m-reza-rahman/master

Update dependency and runtime versions
javaeekickoff · Jun 20, 2024 · ed69ece · ed69ece
2 parents 9f39c8b + 9738721
commit ed69ece
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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/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')
 		<wildfly.version>${wildflyVersion}</wildfly.version>
 #end
-		<compiler-plugin.version>3.11.0</compiler-plugin.version>
+		<compiler-plugin.version>3.13.0</compiler-plugin.version>
 		<war-plugin.version>3.4.0</war-plugin.version>
 #if ((${runtime} == 'glassfish') || ((${runtime} == 'payara') && (${profile} == 'full')))
-		<cargo.version>1.10.11</cargo.version>
+		<cargo.version>1.10.13</cargo.version>
 #end
 #if (${runtime} == 'tomee')
-		<tomee-plugin.version>9.1.1</tomee-plugin.version>
+		<tomee-plugin.version>9.1.3</tomee-plugin.version>
 #end
 #if ((${runtime} == 'payara') && (${profile} != 'full'))
-		<payara-micro-plugin.version>2.0</payara-micro-plugin.version>
+		<payara-micro-plugin.version>2.3</payara-micro-plugin.version>
 #end
 #if (${runtime} == 'wildfly')
-		<wildfly-plugin.version>4.2.1.Final</wildfly-plugin.version>
+		<wildfly-plugin.version>5.0.0.Final</wildfly-plugin.version>
 #end
 #if (${runtime} == 'open-liberty')
-		<liberty-plugin.version>3.10</liberty-plugin.version>
+		<liberty-plugin.version>3.10.3</liberty-plugin.version>
 #end
 	</properties>
 

diff --git a/.../src/main/resources/archetype-resources/src/main/java/jakarta/hello/HelloApplication.java b/.../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
@@ -177,6 +177,8 @@
           <server-config>standalone-full.xml</server-config>
         </configuration>
       </plugin>
+
+      <!-- For deploying to Azure. -->
       <plugin>
 		    <groupId>com.microsoft.azure</groupId>
 		    <artifactId>azure-webapp-maven-plugin</artifactId>

diff --git 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
@@ -113,7 +113,6 @@
                                icon="pi pi-arrow-down"
                                action="#{project.generate}"/>
             </f:facet>
-
           </p:panelGrid>
         </h:form>
       </div>