Merge pull request #283 from m-reza-rahman/master

Upgrade Payara, GlassFish, and WildFly
eclipse-ee4j · Sep 30, 2023 · 7c21967 · 7c21967
2 parents de670e7 + 6309ca0
commit 7c21967
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/archetype/src/main/resources/archetype-resources/Dockerfile b/archetype/src/main/resources/archetype-resources/Dockerfile
@@ -50,9 +50,9 @@
 #elseif (${runtime} == 'payara')
 #if (${javaVersion} == '17')
 #if (${profile} == 'full')
-#set ($baseImage = "payara/server-full:6.2023.5-jdk17")
+#set ($baseImage = "payara/server-full:6.2023.9-jdk17")
 #else
-#set ($baseImage = "payara/server-web:6.2023.5-jdk17")
+#set ($baseImage = "payara/server-web:6.2023.9-jdk17")
 #end
 #else
 #if (${profile} == 'full')
@@ -64,7 +64,7 @@
 #set ($deployDirectory = "$DEPLOY_DIR")
 #elseif (${runtime} == 'wildfly')
 #if (${javaVersion} == '17')
-#set ($baseImage = "quay.io/wildfly/wildfly")
+#set ($baseImage = "quay.io/wildfly/wildfly:latest-jdk17")
 #else
 #set ($baseImage = "quay.io/wildfly/wildfly:latest-jdk11")
 #end

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.2023.5")
+#set ($payaraVersion = "6.2023.9")
 #set ($tomeeVersion = "9.1.0")
 #set ($glassfishContainerId = "glassfish7x")
 #if (${profile} == 'web')
-#set ($glassfishUrl = "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/web/7.0.5/web-7.0.5.zip")
+#set ($glassfishUrl = "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/web/7.0.9/web-7.0.9.zip")
 #else
-#set ($glassfishUrl = "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.5/glassfish-7.0.5.zip")
+#set ($glassfishUrl = "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.9/glassfish-7.0.9.zip")
 #end
 #end
 #if (${jakartaVersion} == '10')
-#set ($wildflyVersion = "27.0.1.Final")
+#set ($wildflyVersion = "29.0.1.Final")
 #else
 #set ($wildflyVersion = "26.1.3.Final")
 #end
@@ -75,9 +75,9 @@
 		<wildfly.version>${wildflyVersion}</wildfly.version>
 #end
 		<compiler-plugin.version>3.11.0</compiler-plugin.version>
-		<war-plugin.version>3.3.2</war-plugin.version>
+		<war-plugin.version>3.4.0</war-plugin.version>
 #if ((${runtime} == 'glassfish') || ((${runtime} == 'payara') && (${profile} == 'full')))
-		<cargo.version>1.10.7</cargo.version>
+		<cargo.version>1.10.9</cargo.version>
 #end
 #if (${runtime} == 'tomee')
 		<tomee-plugin.version>9.1.0</tomee-plugin.version>
@@ -86,7 +86,7 @@
 		<payara-micro-plugin.version>2.0</payara-micro-plugin.version>
 #end
 #if (${runtime} == 'wildfly')
-		<wildfly-plugin.version>4.1.0.Final</wildfly-plugin.version>
+		<wildfly-plugin.version>4.2.0.Final</wildfly-plugin.version>
 #end
 #if (${runtime} == 'open-liberty')
 		<liberty-plugin.version>3.8.2</liberty-plugin.version>