From 09c76ee4e69d4fb1bd6ab7311e892b41dfa7edf5 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta@payara.fish>
Date: Wed, 14 Feb 2024 15:22:54 +0530
Subject: [PATCH 1/2] FISH-8265 Upgrade Payara version to 6.2024.12

---
 .../main/resources/META-INF/maven/archetype-metadata.xml    | 2 +-
 payara-micro-maven-plugin/pom.xml                           | 2 +-
 .../java/fish/payara/maven/plugins/micro/BundleMojo.java    | 6 +++---
 .../java/fish/payara/maven/plugins/micro/StartMojo.java     | 2 +-
 .../src/test/resources/payara-micro/pom-without-config.xml  | 2 +-
 .../src/test/resources/payara-micro/pom.xml                 | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/payara-micro-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/payara-micro-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index e6fc3d12..0499fbe0 100644
--- a/payara-micro-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/payara-micro-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -48,7 +48,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
             <defaultValue>11</defaultValue>
         </requiredProperty>
         <requiredProperty key="payaraMicroVersion">
-            <defaultValue>6.2023.12</defaultValue>
+            <defaultValue>6.2024.2</defaultValue>
         </requiredProperty>
         <requiredProperty key="autoBindHttp">
             <defaultValue>true</defaultValue>
diff --git a/payara-micro-maven-plugin/pom.xml b/payara-micro-maven-plugin/pom.xml
index 75bdf318..0b80cf8f 100644
--- a/payara-micro-maven-plugin/pom.xml
+++ b/payara-micro-maven-plugin/pom.xml
@@ -49,7 +49,7 @@
         <java.compiler.source.version>1.8</java.compiler.source.version>
         <java.compiler.target.version>1.8</java.compiler.target.version>
         <maven-api.version>3.9.5</maven-api.version>
-        <payara.version>6.2023.12</payara.version>
+        <payara.version>6.2024.2</payara.version>
     </properties>
     <scm>
         <connection>scm:git:https://github.com/payara/ecosystem-maven/</connection>
diff --git a/payara-micro-maven-plugin/src/main/java/fish/payara/maven/plugins/micro/BundleMojo.java b/payara-micro-maven-plugin/src/main/java/fish/payara/maven/plugins/micro/BundleMojo.java
index ff75ae98..3dcc4191 100644
--- a/payara-micro-maven-plugin/src/main/java/fish/payara/maven/plugins/micro/BundleMojo.java
+++ b/payara-micro-maven-plugin/src/main/java/fish/payara/maven/plugins/micro/BundleMojo.java
@@ -51,7 +51,7 @@
 /**
  * Bundle mojo incorporates payara-micro with the produced artifact by following steps given as follows:
  * <ul>
- *  <li>Fetch payara-micro from repository and open it to a folder. The default version is <i>6.2023.12</i>. Specific
+ *  <li>Fetch payara-micro from repository and open it to a folder. The default version is <i>6.2024.2</i>. Specific
  *  version can be provided with @{code payaraVersion} parameter</li>
  *  <li>Fetch user specified jars from repository</li>
  *  <li>Copy any existing {@code domain.xml}, {@code keystore.jks}, {@code login.conf } and {@code login.properties} files from resources folder into /MICRO-INF/domain folder</li>
@@ -80,9 +80,9 @@
 public class BundleMojo extends BasePayaraMojo {
 
     /**
-     * By default this mojo fetches payara-micro with version 6.2023.12. It can be overridden with this parameter.
+     * By default this mojo fetches payara-micro with version 6.2024.2. It can be overridden with this parameter.
      */
-    @Parameter(property = "payaraVersion", defaultValue = "6.2023.12")
+    @Parameter(property = "payaraVersion", defaultValue = "6.2024.2")
     private String payaraVersion;
 
     /**
diff --git a/payara-micro-maven-plugin/src/main/java/fish/payara/maven/plugins/micro/StartMojo.java b/payara-micro-maven-plugin/src/main/java/fish/payara/maven/plugins/micro/StartMojo.java
index f3b330ef..7c4f9b41 100644
--- a/payara-micro-maven-plugin/src/main/java/fish/payara/maven/plugins/micro/StartMojo.java
+++ b/payara-micro-maven-plugin/src/main/java/fish/payara/maven/plugins/micro/StartMojo.java
@@ -86,7 +86,7 @@ public class StartMojo extends BasePayaraMojo {
     @Parameter(property = "javaPath")
     private String javaPath;
 
-    @Parameter(property = "payaraVersion", defaultValue = "6.2023.12")
+    @Parameter(property = "payaraVersion", defaultValue = "6.2024.2")
     private String payaraVersion;
 
     @Parameter(property = "payaraMicroAbsolutePath")
diff --git a/payara-micro-maven-plugin/src/test/resources/payara-micro/pom-without-config.xml b/payara-micro-maven-plugin/src/test/resources/payara-micro/pom-without-config.xml
index 1ea2b527..5fc469b4 100644
--- a/payara-micro-maven-plugin/src/test/resources/payara-micro/pom-without-config.xml
+++ b/payara-micro-maven-plugin/src/test/resources/payara-micro/pom-without-config.xml
@@ -19,7 +19,7 @@
         <version.jca>2.1.0</version.jca>
         <version.jbatch>2.1.1</version.jbatch>
         <version.microprofile>5.0</version.microprofile>
-        <version.payara>6.2023.12</version.payara>
+        <version.payara>6.2024.2</version.payara>
     </properties>
     
     <dependencies>
diff --git a/payara-micro-maven-plugin/src/test/resources/payara-micro/pom.xml b/payara-micro-maven-plugin/src/test/resources/payara-micro/pom.xml
index 1bc65e92..e7b9355f 100644
--- a/payara-micro-maven-plugin/src/test/resources/payara-micro/pom.xml
+++ b/payara-micro-maven-plugin/src/test/resources/payara-micro/pom.xml
@@ -19,7 +19,7 @@
         <version.jca>2.1.0</version.jca>
         <version.jbatch>2.1.1</version.jbatch>
         <version.microprofile>5.0</version.microprofile>
-        <version.payara>6.2023.12</version.payara>
+        <version.payara>6.2024.2</version.payara>
     </properties>
     
     <dependencies>

From 44e4c70f25d30e339159ca849470e0cc9d3b0ce0 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta@payara.fish>
Date: Wed, 14 Feb 2024 15:23:31 +0530
Subject: [PATCH 2/2] FISH-8265 Release Payara Micro Maven tools v2.2

---
 payara-micro-maven-archetype/pom.xml | 2 +-
 payara-micro-maven-plugin/pom.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/payara-micro-maven-archetype/pom.xml b/payara-micro-maven-archetype/pom.xml
index e2bc1be8..05718c76 100644
--- a/payara-micro-maven-archetype/pom.xml
+++ b/payara-micro-maven-archetype/pom.xml
@@ -42,7 +42,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fish.payara.maven.archetypes</groupId>
     <artifactId>payara-micro-maven-archetype</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.2</version>
     <packaging>maven-archetype</packaging>
     <name>Payara Micro Archetype</name>
     <description>Archetype for Payara Micro application.</description>
diff --git a/payara-micro-maven-plugin/pom.xml b/payara-micro-maven-plugin/pom.xml
index 0b80cf8f..548b0be5 100644
--- a/payara-micro-maven-plugin/pom.xml
+++ b/payara-micro-maven-plugin/pom.xml
@@ -40,7 +40,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fish.payara.maven.plugins</groupId>
     <artifactId>payara-micro-maven-plugin</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.2</version>
     <packaging>maven-plugin</packaging>
     <name>Payara Micro Maven Plugin</name>
     <description>Payara Micro Maven Plugin that incorporates payara-micro with the produced artifact</description>