Skip to content

Commit

Permalink
MARP-626 Fix for Dev Fail on Market-Monitor (#24)
Browse files Browse the repository at this point in the history
  • Loading branch information
phhung-axonivy authored Aug 2, 2024
1 parent 432506d commit 962ce21
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
13 changes: 11 additions & 2 deletions approval-decision-utils-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,25 @@

<properties>
<ivy.engine.version>10.0.18</ivy.engine.version>
<build.plugin.version>10.0.16</build.plugin.version>
<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>${build.plugin.version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
<executions>
<execution>
Expand Down
32 changes: 25 additions & 7 deletions approval-decision-utils-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,29 @@
<artifactId>approval-decision-utils-test</artifactId>
<version>10.0.21-SNAPSHOT</version>
<packaging>iar-integration-test</packaging>
<properties>
<ivy.engine.version>10.0.18</ivy.engine.version>
<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.utils.approvaldecision</groupId>
Expand All @@ -21,23 +44,18 @@
<dependency>
<groupId>com.axonivy.ivy.webtest</groupId>
<artifactId>web-tester</artifactId>
<version>11.2.1</version>
<version>${tester.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<properties>
<ivy.engine.version>10.0.18</ivy.engine.version>
<build.plugin.version>10.0.16</build.plugin.version>
</properties>

<build>
<testSourceDirectory>src_test</testSourceDirectory>
<plugins>
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${build.plugin.version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<encoding>UTF-8</encoding>
Expand Down
14 changes: 12 additions & 2 deletions approval-decision-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<artifactId>approval-decision-utils</artifactId>
<version>10.0.21-SNAPSHOT</version>
<packaging>iar</packaging>

<repositories>
<repository>
<snapshots>
Expand All @@ -30,8 +31,17 @@

<properties>
<ivy.engine.version>10.0.18</ivy.engine.version>
<build.plugin.version>10.0.16</build.plugin.version>
<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>
<sourceDirectory>src</sourceDirectory>
Expand All @@ -40,7 +50,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${build.plugin.version}</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
<executions>
<execution>
Expand Down

0 comments on commit 962ce21

Please sign in to comment.