From 615b6a8fc987c1939560a59b48ef85c4c8a1b5f8 Mon Sep 17 00:00:00 2001 From: Roman Szturc Date: Thu, 31 Oct 2024 10:57:00 +0100 Subject: [PATCH 1/2] Orizaba is default Eiffel protocol --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c7fca5..4b48c0d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 2.1.12 - 2.2.7 + 2.4.0 eiffel-remrem-generate ${eiffel-remrem-generate.version} From 3197f2340c24edb136f8ee01b2eb7eb620df93ba Mon Sep 17 00:00:00 2001 From: Roman Szturc Date: Fri, 8 Nov 2024 15:39:02 +0100 Subject: [PATCH 2/2] Test files updated --- .../EiffelRemremControllerIT.java | 2 +- .../src/test/resources/ActivityFinished.json | 25 ++++++++++--------- .../src/test/resources/ArtifactCreated.json | 8 +++--- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/service/src/test/java/com/ericsson/eiffel/remrem/generate/integrationtest/EiffelRemremControllerIT.java b/service/src/test/java/com/ericsson/eiffel/remrem/generate/integrationtest/EiffelRemremControllerIT.java index d0cac94..4a1eede 100644 --- a/service/src/test/java/com/ericsson/eiffel/remrem/generate/integrationtest/EiffelRemremControllerIT.java +++ b/service/src/test/java/com/ericsson/eiffel/remrem/generate/integrationtest/EiffelRemremControllerIT.java @@ -67,7 +67,7 @@ public class EiffelRemremControllerIT { private String activityFinishedDuplicateKeysFileName = "ActivityFinishedEventDuplicatedKeys.json"; private String activityFinishedDuplicateKeysBody; - private String version = "3.0.0"; + private String version = "3.3.0"; @Value("${event-repository.enabled}") private String eventRepositoryEnabled; @Value("${event-repository.url}") diff --git a/service/src/test/resources/ActivityFinished.json b/service/src/test/resources/ActivityFinished.json index ed4bc50..8f34965 100644 --- a/service/src/test/resources/ActivityFinished.json +++ b/service/src/test/resources/ActivityFinished.json @@ -2,7 +2,8 @@ "msgParams": { "meta": { "type": "EiffelActivityFinishedEvent", - "version": "3.0.0", + "version": "3.3.0", + "schemaUri": "https://eiffel/schemas/EiffelActivityFinishedEvent/3.3.0.json", "tags": [ "tag1", "tag2" @@ -11,14 +12,17 @@ "domainId": "domainID", "host": "host", "name": "name", - "uri": "http:\/\/java.sun.com\/j2se\/1.3\/" + "uri": "http:\/\/java.sun.com\/j2se\/1.3\/", + "serializer":"pkg:maven" + }, + "security": { + "authorIdentity": "abc" } } }, "eventParams": { "data": { - "customData": [ - { + "customData": [{ "key": "firstLog", "value": "http:\/\/myHost.com\/firstLog" }, @@ -31,8 +35,7 @@ "conclusion": "TIMED_OUT", "description": "Compilation timed out." }, - "persistentLogs": [ - { + "persistentLogs": [{ "name": "firstLog", "uri": "http:\/\/myHost.com\/firstLog" }, @@ -42,11 +45,9 @@ } ] }, - "links": [ - { - "type": "ACTIVITY_EXECUTION", - "target": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee1" - } - ] + "links": [{ + "type": "ACTIVITY_EXECUTION", + "target": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee1" + }] } } \ No newline at end of file diff --git a/service/src/test/resources/ArtifactCreated.json b/service/src/test/resources/ArtifactCreated.json index aa5c8d6..7ee8db9 100644 --- a/service/src/test/resources/ArtifactCreated.json +++ b/service/src/test/resources/ArtifactCreated.json @@ -2,7 +2,8 @@ "msgParams": { "meta": { "type": "EiffelArtifactCreatedEvent", - "version": "3.0.0", + "version": "3.3.0", + "schemaUri": "https://eiffel/schemas/EiffelArtifactCreatedEvent/3.3.0.json", "tags": [ "tag1", "tag2" @@ -35,7 +36,8 @@ "name": "event", "dependsOn": [ ], - "implement": [ + "implement": [ + ], "identity":"pkg:abc", "customData": [{ @@ -65,4 +67,4 @@ "target": "aaaaaaaa-bbbb-5ccc-8ddd-eeeeeeeeeee3" }] } -} +} \ No newline at end of file