MARP-626 Fix for Dev Fail on Market-Monitor

axonivy-market · Aug 1, 2024 · 58d8175 · 58d8175
1 parent 1daf6ed
commit 58d8175
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,6 +9,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2
-    with:
-      mvnArgs: -Dmaven.test.failure.ignore=true -Divy.engine.version=10.0.11
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
diff --git 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
@@ -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/srf-weather-connector-demo/pom.xml b/srf-weather-connector-demo/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>srf-weather-connector-demo</artifactId>
   <version>10.0.4-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.srf.weather</groupId>
@@ -18,7 +30,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/srf-weather-connector-test/pom.xml b/srf-weather-connector-test/pom.xml
@@ -5,11 +5,33 @@
 	<artifactId>srf-weather-connector-test</artifactId>
 	<version>10.0.4-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.ivy.test</groupId>
 			<artifactId>unit-tester</artifactId>
-			<version>10.0.0</version>
+			<version>${tester.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -42,7 +64,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/...onnector-test/src_test/com/axonivy/connector/srf/weather/test/TestSrfWeatherForecast.java b/...onnector-test/src_test/com/axonivy/connector/srf/weather/test/TestSrfWeatherForecast.java
@@ -15,7 +15,7 @@
 import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest;
 import ch.ivyteam.ivy.environment.AppFixture;
 
-@IvyProcessTest
+@IvyProcessTest(enableWebServer = true)
 class TestSrfWeatherForecast {
 
 	private static final BpmProcess testee = BpmProcess.path("srfWeatherForecast");

diff --git a/srf-weather-connector-webTest/pom.xml b/srf-weather-connector-webTest/pom.xml
@@ -5,6 +5,28 @@
   <artifactId>srf-weather-connector-webTest</artifactId>
   <version>10.0.4-SNAPSHOT</version>
   <packaging>iar-integration-test</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.srf.weather</groupId>
@@ -15,7 +37,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>
@@ -25,7 +47,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/srf-weather-connector/pom.xml b/srf-weather-connector/pom.xml
@@ -5,12 +5,24 @@
   <artifactId>srf-weather-connector</artifactId>
   <version>10.0.4-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>
   <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>