Merge pull request #33 from jGauravGupta/FISH-8257-2

FISH-8257 Release Payara Starter v1.0-beta6
payara · Feb 26, 2024 · 4fdfd67 · 4fdfd67
2 parents 143906c + eeb4f70
commit 4fdfd67
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fish.payara.starter</groupId>
     <artifactId>payara-starter-parent</artifactId>
-    <version>1.0-beta5</version>
+    <version>1.0-beta6</version>
     <packaging>pom</packaging>
     <name>Payara Starter Parent</name>
     <description>Payara Starter Parent</description>

diff --git a/starter-archetype/pom.xml b/starter-archetype/pom.xml
@@ -41,14 +41,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>payara-starter-archetype</artifactId>
-    <version>1.0-beta5</version>
+    <version>1.0-beta6</version>
     <packaging>maven-archetype</packaging>
     <name>Payara Starter Archetype</name>
     <description>Archetype for Payara Platform application.</description>
     <parent>
         <groupId>fish.payara.starter</groupId>
         <artifactId>payara-starter-parent</artifactId>
-        <version>1.0-beta5</version>
+        <version>1.0-beta6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>

diff --git a/starter-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/starter-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -77,7 +77,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
             <validationRegex>^(server|micro)$</validationRegex>
         </requiredProperty>
         <requiredProperty key="payaraVersion">
-            <defaultValue>6.2023.12</defaultValue>
+            <defaultValue>6.2024.2</defaultValue>
         </requiredProperty>
         <requiredProperty key="autoBindHttp">
             <defaultValue>true</defaultValue>

diff --git a/starter-archetype/src/main/resources/archetype-resources/Dockerfile b/starter-archetype/src/main/resources/archetype-resources/Dockerfile
@@ -2,7 +2,7 @@
 #if (${jakartaEEVersion} == '8')
 #set ($payaraVersion = "5.2022.5")
 #else
-#set ($payaraVersion = "6.2023.8")
+#set ($payaraVersion = "6.2024.2")
 #end
 #end
 #if (${platform} == 'server')

diff --git a/starter-archetype/src/main/resources/archetype-resources/README.md b/starter-archetype/src/main/resources/archetype-resources/README.md
@@ -28,7 +28,11 @@ To run the application locally, follow these steps:
 #if (${platform} == 'server')
 ./mvn clean package cargo:run
 #else
+#if (${javaVersion} == '8')
 ./mvn clean package payara-micro:start
+#else
+./mvn clean package payara-micro:dev
+#end
 #end
 #else
 #if (${platform} == 'server')

diff --git a/starter-archetype/src/main/resources/archetype-resources/build.gradle b/starter-archetype/src/main/resources/archetype-resources/build.gradle
@@ -15,18 +15,11 @@
     #set ($eeArtifactId = "jakarta.jakartaee-api")
 #end
 #set ($payaraUrlPrefix = "https://repo1.maven.org/maven2/fish/payara/distributions")
-#if (${jakartaEEVersion} == '8')
-    #set ($payaraHome = "payara5")
-#else
-    #set ($payaraHome = "payara6")
-#end
 #if (!${payaraVersion})
     #if (${jakartaEEVersion} == '8')
         #set ($payaraVersion = "5.2022.5")
-        #set ($microprofileVersion = "4.0")
     #else
-        #set ($payaraVersion = "6.2023.8")
-        #set ($microprofileVersion = "5.0")
+        #set ($payaraVersion = "6.2024.2")
     #end
 #end
 #if (${profile} == 'full')
@@ -35,9 +28,11 @@
     #set ($payaraUrl = "${payaraUrlPrefix}/payara-web/${payaraVersion}/payara-web-${payaraVersion}.zip")
 #end
 #if (${jakartaEEVersion} == '8')
-#set ($microprofileVersion = "4.0")
+    #set ($payaraHome = "payara5")
+    #set ($microprofileVersion = "4.1")
 #else
-#set ($microprofileVersion = "5.0")
+    #set ($payaraHome = "payara6")
+    #set ($microprofileVersion = "6.1")
 #end
 plugins {
     id 'java'

diff --git a/starter-archetype/src/main/resources/archetype-resources/pom.xml b/starter-archetype/src/main/resources/archetype-resources/pom.xml
@@ -24,7 +24,7 @@
     #if (${jakartaEEVersion} == '8')
         #set ($payaraVersion = "5.2022.5")
     #else
-        #set ($payaraVersion = "6.2023.8")
+        #set ($payaraVersion = "6.2024.2")
     #end
 #end
 #if (${profile} == 'full')
@@ -193,7 +193,11 @@
             <plugin>
                 <groupId>fish.payara.maven.plugins</groupId>
                 <artifactId>payara-micro-maven-plugin</artifactId>
+#if (${javaVersion} == '8')
                 <version>2.0</version>
+#else
+                <version>2.2</version>
+#end
                 <configuration>
                     <payaraVersion>${payara.version}</payaraVersion>
 #if (${deployWar} == "true")

diff --git a/starter-ui/pom.xml b/starter-ui/pom.xml
@@ -41,14 +41,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>payara-starter-ui</artifactId>
-    <version>1.0-beta5</version>
+    <version>1.0-beta6</version>
     <packaging>war</packaging>
     <name>Payara Starter UI</name>
     <description>Payara Starter UI</description>
     <parent>
         <groupId>fish.payara.starter</groupId>
         <artifactId>payara-starter-parent</artifactId>
-        <version>1.0-beta5</version>
+        <version>1.0-beta6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <dependencies>
@@ -123,7 +123,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.11.0</version>
                 <configuration>
                     <release>11</release>
                 </configuration>
@@ -152,7 +152,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -162,6 +162,11 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>fish.payara.maven.plugins</groupId>
+                <artifactId>payara-micro-maven-plugin</artifactId>
+                <version>2.2</version>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/starter-ui/src/main/java/fish/payara/starter/resources/ApplicationGeneratorResource.java b/starter-ui/src/main/java/fish/payara/starter/resources/ApplicationGeneratorResource.java
@@ -86,7 +86,7 @@ public class ApplicationGeneratorResource {
     private static final String WORKING_DIR_PREFIX = "payara-starter-";
     private static final String ARCHETYPE_GROUP_ID = "fish.payara.starter";
     private static final String ARCHETYPE_ARTIFACT_ID = "payara-starter-archetype";
-    private static final String ARCHETYPE_VERSION = "1.0-beta5";
+    private static final String ARCHETYPE_VERSION = "1.0-beta6";
     private static final String MAVEN_ARCHETYPE_CMD = "archetype:generate";
     private static final String ZIP_EXTENSION = ".zip";