From eb0c80b3e5fb153d6133a4965356da64d610cc97 Mon Sep 17 00:00:00 2001
From: Pham Hoang Hung <84316773+phhung-axonivy@users.noreply.github.com>
Date: Fri, 2 Aug 2024 15:42:26 +0700
Subject: [PATCH] MARP-626 Fix for Dev Fail on Market-Monitor (#15)

---
 .github/workflows/ci.yml                      |  2 +-
 .github/workflows/dev.yml                     |  2 +-
 .github/workflows/release.yml                 |  2 +-
 docker-connector-demo/pom.xml                 | 14 +++++++++-
 .../processes/dockerDemo.p.json               |  2 +-
 docker-connector-test/pom.xml                 | 26 +++++++++++++++++--
 docker-connector/pom.xml                      | 14 +++++++++-
 7 files changed, 54 insertions(+), 8 deletions(-)

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.yml b/.github/workflows/dev.yml
index a27a639..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@v2
+    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/docker-connector-demo/pom.xml b/docker-connector-demo/pom.xml
index 94f893e..0d39b18 100644
--- a/docker-connector-demo/pom.xml
+++ b/docker-connector-demo/pom.xml
@@ -8,6 +8,18 @@
   <organization>
     <name>Axon Ivy AG</name>
   </organization>
+  <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.market</groupId>
@@ -21,7 +33,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/docker-connector-demo/processes/dockerDemo.p.json b/docker-connector-demo/processes/dockerDemo.p.json
index 5f58bb7..ed73b86 100644
--- a/docker-connector-demo/processes/dockerDemo.p.json
+++ b/docker-connector-demo/processes/dockerDemo.p.json
@@ -41,7 +41,7 @@
           "code" : [
             "import com.axonivy.connector.docker.PortBinding;",
             "PortBinding binding = new PortBinding();",
-            "binding.publicPort = ivy.var.AxonIvyEngine_Port.toNumber();",
+            "binding.publicPort = ivy.var.get(\"AxonIvyEngine.Port\").toNumber();",
             "binding.internalPort = 8080;",
             "",
             "param.ports = [binding];"
diff --git a/docker-connector-test/pom.xml b/docker-connector-test/pom.xml
index 2b62fa7..154218e 100644
--- a/docker-connector-test/pom.xml
+++ b/docker-connector-test/pom.xml
@@ -8,6 +8,28 @@
   <organization>
     <name>Axon Ivy AG</name>
   </organization>
+  <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.market</groupId>
@@ -18,7 +40,7 @@
     <dependency>
       <groupId>com.axonivy.ivy.webtest</groupId>
       <artifactId>web-tester</artifactId>
-      <version>10.0.0</version>
+      <version>${tester.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -28,7 +50,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/docker-connector/pom.xml b/docker-connector/pom.xml
index 883bbb8..bf506b4 100644
--- a/docker-connector/pom.xml
+++ b/docker-connector/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>docker-connector</artifactId>
   <version>10.0.1-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>
   <organization>
     <name>Axon Ivy AG</name>
   </organization>
@@ -31,7 +43,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>