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

axonivy-market · Aug 2, 2024 · d7c4a0c · d7c4a0c
1 parent d7d3e49
commit d7c4a0c
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,6 +9,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2
-    with:
-      mvnArgs: -Dmaven.test.failure.ignore=true
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -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
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/threema-connector-demo/pom.xml b/threema-connector-demo/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>threema-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.threema</groupId>
@@ -18,7 +30,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.16</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

diff --git a/threema-connector-test/pom.xml b/threema-connector-test/pom.xml
@@ -5,6 +5,28 @@
   <artifactId>threema-connector-test</artifactId>
   <version>10.0.3-SNAPSHOT</version>
   <packaging>iar</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.connector.threema</groupId>
@@ -15,7 +37,7 @@
     <dependency>
       <groupId>com.axonivy.ivy.test</groupId>
       <artifactId>unit-tester</artifactId>
-      <version>10.0.16</version>
+      <version>${tester.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -36,7 +58,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.16</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

diff --git a/threema-connector-test/src_test/threema/connector/test/process/MessageEncryptionTest.java b/threema-connector-test/src_test/threema/connector/test/process/MessageEncryptionTest.java
@@ -12,7 +12,7 @@
 import ch.threema.apitool.CryptTool;
 import threema.connector.ReceiverData;
 
-@IvyProcessTest
+@IvyProcessTest(enableWebServer = true)
 public class MessageEncryptionTest {
 
   private final static BpmProcess ENCRYPTION_PROCESS = BpmProcess.name("messageEncryption");

diff --git a/threema-connector-webtest/pom.xml b/threema-connector-webtest/pom.xml
@@ -5,6 +5,28 @@
   <artifactId>threema-connector-webtest</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.connector.threema</groupId>
@@ -21,7 +43,7 @@
     <dependency>
       <groupId>com.axonivy.ivy.webtest</groupId>
       <artifactId>web-tester</artifactId>
-      <version>10.0.16</version>
+      <version>${tester.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -31,7 +53,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.16</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

diff --git a/threema-connector/pom.xml b/threema-connector/pom.xml
@@ -5,13 +5,24 @@
   <artifactId>threema-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>
   <build>
     <plugins>
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.16</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
        <plugin>

diff --git a/threema-connector/processes/util/getReceiverInfo.p.json b/threema-connector/processes/util/getReceiverInfo.p.json
@@ -49,8 +49,8 @@
         "clientId" : "af315689-b538-4142-a823-0632d66754d7",
         "clientErrorCode" : "ivy:error:rest:client",
         "queryParams" : {
-          "secret" : "ivy.var.threemaConnector_secret",
-          "from" : "ivy.var.threemaConnector_threemaId"
+          "secret" : "ivy.var.get(\"threemaConnector.secret\")",
+          "from" : "ivy.var.get(\"threemaConnector.threemaId\")"
         },
         "statusErrorCode" : ">> Ignore status",
         "responseMapping" : {
@@ -78,8 +78,8 @@
         "clientId" : "af315689-b538-4142-a823-0632d66754d7",
         "clientErrorCode" : "ivy:error:rest:client",
         "queryParams" : {
-          "from" : "ivy.var.threemaConnector_threemaId",
-          "secret" : "ivy.var.threemaConnector_secret"
+          "from" : "ivy.var.get(\"threemaConnector.threemaId\")",
+          "secret" : "ivy.var.get(\"threemaConnector.secret\")"
         },
         "statusErrorCode" : ">> Ignore status",
         "responseMapping" : {

diff --git a/threema-connector/processes/util/sendMessage.p.json b/threema-connector/processes/util/sendMessage.p.json
@@ -45,11 +45,11 @@
       "name" : "sendMessage",
       "config" : {
         "bodyForm" : {
-          "from" : "ivy.var.threemaConnector_threemaId",
+          "from" : "ivy.var.get(\"threemaConnector.threemaId\")",
           "to" : "in.threemaId",
           "nonce" : "in.nonce",
           "box" : "in.encryptedMessage",
-          "secret" : "ivy.var.threemaConnector_secret",
+          "secret" : "ivy.var.get(\"threemaConnector.secret\")",
           "" : ""
         },
         "path" : "send_e2e",
-Original file 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