From 602cc2550a25b042fdb965c47f6327d96561420a Mon Sep 17 00:00:00 2001
From: PHAM HOANG HUNG <hung.pham@axonactive.com>
Date: Thu, 1 Aug 2024 08:37:17 +0700
Subject: [PATCH] MARP-626 Fix for Dev Fail on Market-Monitor

---
 .github/workflows/ci.yml                  |  2 +-
 .github/workflows/dev-10.yml              | 11 ----------
 .github/workflows/dev.yml                 |  2 +-
 .github/workflows/release.yml             |  2 +-
 mattermost-connector-demo/pom.xml         | 14 +++++++++++-
 mattermost-connector-notification/pom.xml | 14 +++++++++++-
 mattermost-connector-test/pom.xml         | 26 +++++++++++++++++++++--
 mattermost-connector/pom.xml              | 14 +++++++++++-
 8 files changed, 66 insertions(+), 19 deletions(-)
 delete mode 100644 .github/workflows/dev-10.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1bc3496..87d78f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,4 +9,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
diff --git a/.github/workflows/dev-10.yml b/.github/workflows/dev-10.yml
deleted file mode 100644
index 6603e21..0000000
--- a/.github/workflows/dev-10.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Dev-10-Build
-
-on:
-  push:
-  schedule:
-    - cron:  '21 21 * * *'
-  workflow_dispatch:
-
-jobs:
-  build:
-    uses: axonivy-market/github-workflows/.github/workflows/dev-10.yml@feature/MARP-626-Fix-for-Dev-Fail-on-Market-Monitor
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 03dc95f..c2fee37 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@feature/MARP-626-Fix-for-Dev-Fail-on-Market-Monitor
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 128a183..ab5b0d7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,4 +4,4 @@ on: workflow_dispatch
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4
diff --git a/mattermost-connector-demo/pom.xml b/mattermost-connector-demo/pom.xml
index f9279c2..2345935 100644
--- a/mattermost-connector-demo/pom.xml
+++ b/mattermost-connector-demo/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>mattermost-connector-demo</artifactId>
   <version>10.0.20-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>10.0.16</project.build.plugin.version>
+  </properties>
+  <pluginRepositories>
+    <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.mattermost</groupId>
@@ -33,7 +45,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.14</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>
diff --git a/mattermost-connector-notification/pom.xml b/mattermost-connector-notification/pom.xml
index e367f29..11820ef 100644
--- a/mattermost-connector-notification/pom.xml
+++ b/mattermost-connector-notification/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>mattermost-connector-notification</artifactId>
   <version>10.0.20-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>10.0.16</project.build.plugin.version>
+  </properties>
+  <pluginRepositories>
+    <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.mattermost</groupId>
@@ -18,7 +30,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.14</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>
diff --git a/mattermost-connector-test/pom.xml b/mattermost-connector-test/pom.xml
index c443acb..8aa5201 100644
--- a/mattermost-connector-test/pom.xml
+++ b/mattermost-connector-test/pom.xml
@@ -5,6 +5,28 @@
   <artifactId>mattermost-connector-test</artifactId>
   <version>10.0.20-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>
+    <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.connector.mattermost</groupId>
@@ -15,7 +37,7 @@
     <dependency>
     	<groupId>com.axonivy.ivy.test</groupId>
     	<artifactId>unit-tester</artifactId>
-    	<version>10.0.14</version>
+    	<version>${tester.version}</version>
     	<scope>test</scope>
     </dependency>
   </dependencies>
@@ -36,7 +58,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.14</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>
diff --git a/mattermost-connector/pom.xml b/mattermost-connector/pom.xml
index adcec9e..fd268fc 100644
--- a/mattermost-connector/pom.xml
+++ b/mattermost-connector/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>mattermost-connector</artifactId>
   <version>10.0.20-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>10.0.16</project.build.plugin.version>
+  </properties>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
   <repositories>
     <repository>
       <snapshots>
@@ -19,7 +31,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.14</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>