MARP-626 Fix for Dev Fail on Market-Monitor (#38)

axonivy-market · Jul 30, 2024 · 0049dfa · 0049dfa
1 parent 7976fd6
commit 0049dfa
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,6 +8,6 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
     secrets:
       mvnArgs: -Daws.access.key=${{ secrets.AWS_ACCESS_KEY }} -Daws.secret.key=${{ secrets.AWS_SECRET_KEY }}
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -8,6 +8,6 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
     secrets:
       mvnArgs: -Daws.access.key=${{ secrets.AWS_ACCESS_KEY }} -Daws.secret.key=${{ secrets.AWS_SECRET_KEY }}
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/amazon-lex-connector-demo/pom.xml b/amazon-lex-connector-demo/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>amazon-lex-connector-demo</artifactId>
   <version>10.0.3-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.amazon.lex</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/amazon-lex-connector-product/pom.xml b/amazon-lex-connector-product/pom.xml
@@ -37,7 +37,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <unzip dest="${basedir}">
                   <fileset dir="${basedir}/..">
                     <include name="**/lib/generated/rest/jaxRsClient_*.jar" />
@@ -47,7 +47,7 @@
                   </patternset>
                   <mapper type="flatten" />
                 </unzip>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>

diff --git a/amazon-lex-connector-test/pom.xml b/amazon-lex-connector-test/pom.xml
@@ -5,11 +5,33 @@
   <artifactId>amazon-lex-connector-test</artifactId>
   <version>10.0.3-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.ivy.webtest</groupId>
       <artifactId>web-tester</artifactId>
-      <version>10.0.0</version>
+      <version>${tester.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -36,7 +58,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>
         <configuration>
           <additionalVmOptions>-Divy.Applications.amazonlexconnectortest.Variables.Amazon.Lex.AccessKey=${aws.access.key}

diff --git a/amazon-lex-connector/pom.xml b/amazon-lex-connector/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>amazon-lex-connector</artifactId>
   <version>10.0.3-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.aws</groupId>
@@ -23,7 +35,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>
-Original file 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