From d7c4a0cecc1d48a642006765c2f6d41ea8cff512 Mon Sep 17 00:00:00 2001
From: Pham Hoang Hung <84316773+phhung-axonivy@users.noreply.github.com>
Date: Fri, 2 Aug 2024 13:41:23 +0700
Subject: [PATCH] MARP-626 Fix for Dev Fail on Market-Monitor (#18)
---
.github/workflows/ci.yml | 4 +--
.github/workflows/dev.yml | 2 +-
.github/workflows/release.yml | 2 +-
threema-connector-demo/pom.xml | 14 +++++++++-
threema-connector-test/pom.xml | 26 +++++++++++++++++--
.../test/process/MessageEncryptionTest.java | 2 +-
threema-connector-webtest/pom.xml | 26 +++++++++++++++++--
threema-connector/pom.xml | 15 +++++++++--
.../processes/util/getReceiverInfo.p.json | 8 +++---
.../processes/util/sendMessage.p.json | 4 +--
10 files changed, 84 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8245c6f..87d78f0 100644
--- 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
index a27a639..c2fee37 100644
--- 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
index 128a183..ab5b0d7 100644
--- 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
index 918af8b..5cf851a 100644
--- a/threema-connector-demo/pom.xml
+++ b/threema-connector-demo/pom.xml
@@ -5,6 +5,18 @@
threema-connector-demo
10.0.3-SNAPSHOT
iar
+
+ 10.0.16
+
+
+
+ sonatype
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ always
+
+
+
com.axonivy.connector.threema
@@ -18,7 +30,7 @@
com.axonivy.ivy.ci
project-build-plugin
- 10.0.16
+ ${project.build.plugin.version}
true
diff --git a/threema-connector-test/pom.xml b/threema-connector-test/pom.xml
index e7a2577..8bfd7be 100644
--- a/threema-connector-test/pom.xml
+++ b/threema-connector-test/pom.xml
@@ -5,6 +5,28 @@
threema-connector-test
10.0.3-SNAPSHOT
iar
+
+ 10.0.16
+ 10.0.16
+
+
+
+ sonatype
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ always
+
+
+
+
+
+ sonatype
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ always
+
+
+
com.axonivy.connector.threema
@@ -15,7 +37,7 @@
com.axonivy.ivy.test
unit-tester
- 10.0.16
+ ${tester.version}
test
@@ -36,7 +58,7 @@
com.axonivy.ivy.ci
project-build-plugin
- 10.0.16
+ ${project.build.plugin.version}
true
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
index 86c7844..e85962d 100644
--- 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
index 946acd4..3611a4b 100644
--- a/threema-connector-webtest/pom.xml
+++ b/threema-connector-webtest/pom.xml
@@ -5,6 +5,28 @@
threema-connector-webtest
10.0.3-SNAPSHOT
iar-integration-test
+
+ 10.0.16
+ 10.0.16
+
+
+
+ sonatype
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ always
+
+
+
+
+
+ sonatype
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ always
+
+
+
com.axonivy.connector.threema
@@ -21,7 +43,7 @@
com.axonivy.ivy.webtest
web-tester
- 10.0.16
+ ${tester.version}
test
@@ -31,7 +53,7 @@
com.axonivy.ivy.ci
project-build-plugin
- 10.0.16
+ ${project.build.plugin.version}
true
diff --git a/threema-connector/pom.xml b/threema-connector/pom.xml
index f7e4c5a..0d403a3 100644
--- a/threema-connector/pom.xml
+++ b/threema-connector/pom.xml
@@ -5,13 +5,24 @@
threema-connector
10.0.3-SNAPSHOT
iar
-
+
+ 10.0.16
+
+
+
+ sonatype
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ always
+
+
+
com.axonivy.ivy.ci
project-build-plugin
- 10.0.16
+ ${project.build.plugin.version}
true
diff --git a/threema-connector/processes/util/getReceiverInfo.p.json b/threema-connector/processes/util/getReceiverInfo.p.json
index 25a794d..9f653ce 100644
--- 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
index 32439a5..74939bb 100644
--- 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",