Skip to content

Commit

Permalink
MARP-626 Fix for Dev Fail on Market-Monitor (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
phhung-axonivy authored Aug 2, 2024
1 parent 1d96080 commit eb0c80b
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 8 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
14 changes: 13 additions & 1 deletion docker-connector-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@
<organization>
<name>Axon Ivy AG</name>
</organization>
<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.market</groupId>
Expand All @@ -21,7 +33,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
2 changes: 1 addition & 1 deletion docker-connector-demo/processes/dockerDemo.p.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"code" : [
"import com.axonivy.connector.docker.PortBinding;",
"PortBinding binding = new PortBinding();",
"binding.publicPort = ivy.var.AxonIvyEngine_Port.toNumber();",
"binding.publicPort = ivy.var.get(\"AxonIvyEngine.Port\").toNumber();",
"binding.internalPort = 8080;",
"",
"param.ports = [binding];"
Expand Down
26 changes: 24 additions & 2 deletions docker-connector-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,28 @@
<organization>
<name>Axon Ivy AG</name>
</organization>
<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.market</groupId>
Expand All @@ -18,7 +40,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 @@ -28,7 +50,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 docker-connector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@
<artifactId>docker-connector</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>
<organization>
<name>Axon Ivy AG</name>
</organization>
Expand All @@ -31,7 +43,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

0 comments on commit eb0c80b

Please sign in to comment.