From a5a85a2a334c1ea426725e56234f155ece80899a Mon Sep 17 00:00:00 2001
From: PHAM HOANG HUNG <hung.pham@axonactive.com>
Date: Thu, 25 Jul 2024 16:33:20 +0700
Subject: [PATCH 1/2] MARP-626 Fix for Dev-Fail on Market Monitor

---
 .github/workflows/ci.yml        |  2 +-
 .github/workflows/dev.yml       |  2 +-
 alfresco-connector-demo/pom.xml | 15 ++++++++++++++-
 alfresco-connector-test/pom.xml | 29 ++++++++++++++++++++++++++---
 alfresco-connector/pom.xml      | 15 ++++++++++++++-
 5 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ea48d2e..1c148ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v3
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index a27a639..ff2bd24 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v3
diff --git a/alfresco-connector-demo/pom.xml b/alfresco-connector-demo/pom.xml
index 8aa5e4c..8bbde4c 100644
--- a/alfresco-connector-demo/pom.xml
+++ b/alfresco-connector-demo/pom.xml
@@ -5,6 +5,19 @@
   <artifactId>alfresco-connector-demo</artifactId>
   <version>10.0.5-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>10.0.16</project.build.plugin.version>
+  </properties>
+  <pluginRepositories>
+    <!-- Snapshot releases are available via sonatype.org -->
+    <pluginRepository>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
   <dependencies>
     <dependency>
       <groupId>com.axonivy.connector.alfresco</groupId>
@@ -18,7 +31,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.6</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>
diff --git a/alfresco-connector-test/pom.xml b/alfresco-connector-test/pom.xml
index 7fa7cd4..645928f 100644
--- a/alfresco-connector-test/pom.xml
+++ b/alfresco-connector-test/pom.xml
@@ -5,17 +5,40 @@
   <artifactId>alfresco-connector-test</artifactId>
   <version>10.0.5-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>10.0.16</project.build.plugin.version>
+    <tester.version>10.0.16</tester.version>
+  </properties>
+  <pluginRepositories>
+    <!-- Snapshot releases are available via sonatype.org -->
+    <pluginRepository>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+  <repositories>
+    <repository>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </repository>
+  </repositories>
   <dependencies>
     <dependency>
       <groupId>com.axonivy.ivy.test</groupId>
       <artifactId>unit-tester</artifactId>
-      <version>10.0.0</version>
+      <version>${tester.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.axonivy.ivy.webtest</groupId>
       <artifactId>web-tester</artifactId>
-      <version>10.0.0</version>
+      <version>${tester.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -48,7 +71,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.6</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>
diff --git a/alfresco-connector/pom.xml b/alfresco-connector/pom.xml
index 42be103..5da76ed 100644
--- a/alfresco-connector/pom.xml
+++ b/alfresco-connector/pom.xml
@@ -5,12 +5,25 @@
   <artifactId>alfresco-connector</artifactId>
   <version>10.0.5-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>10.0.16</project.build.plugin.version>
+  </properties>
+  <pluginRepositories>
+    <!-- Snapshot releases are available via sonatype.org -->
+    <pluginRepository>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
     <plugins>
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.6</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

From 52183e1ad7a5f0bb86bd3e3631fdf3212df31634 Mon Sep 17 00:00:00 2001
From: PHAM HOANG HUNG <hung.pham@axonactive.com>
Date: Thu, 25 Jul 2024 16:48:07 +0700
Subject: [PATCH 2/2] Fix Major Version Upgrade to version 3.0.0

---
 alfresco-connector-product/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfresco-connector-product/pom.xml b/alfresco-connector-product/pom.xml
index 65e1186..220bb37 100644
--- a/alfresco-connector-product/pom.xml
+++ b/alfresco-connector-product/pom.xml
@@ -37,7 +37,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <unzip dest="${basedir}">
                   <fileset dir="${basedir}/..">
                     <include name="**/lib/generated/rest/jaxRsClient_*.jar" />
@@ -47,7 +47,7 @@
                   </patternset>
                   <mapper type="flatten" />
                 </unzip>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>