Skip to content

Commit

Permalink
MARP-626 Fix for Dev Fail on Market-Monitor (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
phhung-axonivy authored Jul 31, 2024
1 parent becfd5a commit 2a60fdd
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@v4
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 24 additions & 2 deletions db-demos-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,28 @@
<artifactId>db-demos-test</artifactId>
<version>11.3.1-SNAPSHOT</version>
<packaging>iar</packaging>
<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.demo</groupId>
Expand All @@ -15,7 +37,7 @@
<dependency>
<groupId>com.axonivy.ivy.test</groupId>
<artifactId>unit-tester</artifactId>
<version>11.3.0</version>
<version>${tester.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -37,7 +59,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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest;
import db.demos.Player;

@IvyProcessTest
@IvyProcessTest(enableWebServer = true)
public class CRUDuserPropertiesTest {

private static final BpmProcess testee = BpmProcess.path("CRUDuserProperties");
Expand Down
26 changes: 24 additions & 2 deletions db-demos-webtest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,28 @@
<artifactId>db-demos-webtest</artifactId>
<version>11.3.1-SNAPSHOT</version>
<packaging>iar-integration-test</packaging>
<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.demo</groupId>
Expand All @@ -15,7 +37,7 @@
<dependency>
<groupId>com.axonivy.ivy.webtest</groupId>
<artifactId>web-tester</artifactId>
<version>11.3.0</version>
<version>${tester.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -25,7 +47,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>
Expand Down
5 changes: 4 additions & 1 deletion db-demos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<artifactId>db-demos</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>
<snapshots>
Expand All @@ -19,7 +22,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>
Expand Down

0 comments on commit 2a60fdd

Please sign in to comment.