MARP-626 Fix for Dev Fail on Market-Monitor

axonivy-market · Jul 30, 2024 · 74ebef2 · 74ebef2
1 parent 1c6e070
commit 74ebef2
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,5 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2
-    # Disable Web Tests
-    # with:
-    #   mvnArgs: -PnoWebTest
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
+
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -8,7 +8,5 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v2
-    with:
-      mvnArgs: -Dwebtester.version=11.2.0-SNAPSHOT
-      # ivyVersion: 10.0.15
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,5 @@ on: workflow_dispatch
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v2
-    # Disable Web Tests
-    # with:
-    #   mvnArgs: -PnoWebTest
+    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4
+
diff --git a/persistence-utils-demo-test/pom.xml b/persistence-utils-demo-test/pom.xml
@@ -6,6 +6,28 @@
   <version>11.3.1-SNAPSHOT</version>
   <packaging>iar</packaging>
   <description>Test project of the persistence utils demo project. Note, that this project is currently also used to test some aspects of the persistence library.</description>
+  <properties>
+    <project.build.plugin.version>11.3.0</project.build.plugin.version>
+    <tester.version>11.3.0</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.utils.persistence</groupId>
@@ -16,7 +38,7 @@
     <dependency>
       <groupId>com.axonivy.ivy.test</groupId>
       <artifactId>unit-tester</artifactId>
-      <version>10.0.16</version>
+      <version>${tester.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -44,7 +66,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>11.3.0</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <compilerOptions>

diff --git a/persistence-utils-demo-tool/pom.xml b/persistence-utils-demo-tool/pom.xml
@@ -5,6 +5,9 @@
   <artifactId>persistence-utils-demo-tool</artifactId>
   <version>11.3.1-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>11.3.0</project.build.plugin.version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>com.axonivy.utils.persistence</groupId>
@@ -23,7 +26,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>11.3.0</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

diff --git a/persistence-utils-demo-webtest/pom.xml b/persistence-utils-demo-webtest/pom.xml
@@ -7,6 +7,7 @@
   <packaging>iar-integration-test</packaging>
   <description>Web Test project of the persistence utils demo project.</description>
   <properties>
+    <project.build.plugin.version>11.3.0</project.build.plugin.version>
     <webtester.version>11.3.0</webtester.version>
   </properties>
   <dependencies>
@@ -38,7 +39,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>11.3.0</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
       <plugin>

diff --git a/persistence-utils-demo/pom.xml b/persistence-utils-demo/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>persistence-utils-demo</artifactId>
   <version>11.3.1-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>11.3.0</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.utils.persistence</groupId>
@@ -26,7 +38,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>11.3.0</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <compilerOptions>

diff --git a/persistence-utils/pom.xml b/persistence-utils/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>persistence-utils</artifactId>
   <version>11.3.1-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>11.3.0</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>org.hibernate</groupId>
@@ -19,7 +31,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>11.3.0</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <compilerOptions>