Skip to content

Commit

Permalink
MARP-626 Fix for Dev Fail on Market-Monitor (#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
phhung-axonivy authored Jul 30, 2024
1 parent c9b56f1 commit 5099d7e
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 7 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
14 changes: 13 additions & 1 deletion html-dialog-utils-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@
<artifactId>html-dialog-utils-demo</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>
<dependencies>
<dependency>
<groupId>com.axonivy.utils.htmldialog</groupId>
Expand All @@ -19,7 +31,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>
Expand Down
26 changes: 24 additions & 2 deletions html-dialog-utils-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@
<artifactId>html-dialog-utils-test</artifactId>
<version>10.0.1-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.utils.htmldialog</groupId>
Expand All @@ -16,7 +38,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>
Expand All @@ -37,7 +59,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>
Expand Down
14 changes: 13 additions & 1 deletion html-dialog-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,24 @@
<artifactId>html-dialog-utils</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>
<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>
Expand Down

0 comments on commit 5099d7e

Please sign in to comment.