Release/march 2024 hotfix 1.8.3 (#1436)

* message-lib fix incident creation wrong headers (#1435)

* dockerfiles use ubi9, fix startup, rm default expose (#1426)

digiwf-connector/digiwf-camunda-connector-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-engine/digiwf-engine-rest-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-engine/digiwf-engine-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-gateway/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-integrations/digiwf-ticket-integration/digiwf-ticket-integration-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"

digiwf-libs/digiwf-message/digiwf-message-core/src/main/java/de/muenchen/oss/digiwf/message/process/impl/ErrorApiImpl.java

@@ -31,9 +31,9 @@ public class ErrorApiImpl implements ErrorApi {
      * @return
      */
     @Override
-    public boolean handleIncident(final Map<String, Object>  originMessageHeaders, final String errorMessage) {
+    public boolean handleIncident(final Map<String, Object> originMessageHeaders, final String errorMessage) {
         final Map<String, Object> headers = Map.of(
-                TYPE, this.incidentDestination,
+                TYPE, originMessageHeaders.get(TYPE),
                 DIGIWF_PROCESS_INSTANCE_ID, originMessageHeaders.get(DIGIWF_PROCESS_INSTANCE_ID),
                 DIGIWF_INTEGRATION_NAME, originMessageHeaders.get(DIGIWF_INTEGRATION_NAME)
         );

digiwf-libs/digiwf-message/digiwf-message-core/src/test/java/de/muenchen/oss/digiwf/message/process/impl/ErrorApiImplTest.java

@@ -34,8 +34,9 @@ class ErrorApiImplTest {
     private final String incidentDestination = "incidentMessageDestination";
     private final String bpmnErrorDestination = "bpmnErrorMessageDestination";
     private final String integrationName = "exampleIntegration";
+    private final String typeName = "exampleType";
     private final Map<String, Object> messageHeaders = Map.of(DIGIWF_PROCESS_INSTANCE_ID, this.processInstanceId,
-            DIGIWF_INTEGRATION_NAME, this.integrationName);
+            DIGIWF_INTEGRATION_NAME, this.integrationName, TYPE, this.typeName);
 
 
     @BeforeEach
@@ -47,7 +48,7 @@ void setUp() {
     void testHandleIncident() {
         final boolean success = this.errorApi.handleIncident(messageHeaders, "someErrorMessage");
         assertThat(success).isTrue();
-        this.verifyIncidentMessageApiCall("someErrorMessage", this.incidentDestination, this.integrationName, this.incidentDestination);
+        this.verifyIncidentMessageApiCall("someErrorMessage", this.typeName, this.integrationName, this.incidentDestination);
     }
 
     @Test
@@ -79,7 +80,7 @@ void testHandleIncidentWithException() {
         final IncidentError incidentError = new IncidentError("someErrorMessage");
         final boolean success = this.errorApi.handleIncident(this.messageHeaders, incidentError);
         assertThat(success).isTrue();
-        this.verifyIncidentMessageApiCall("someErrorMessage", this.incidentDestination, this.integrationName, this.incidentDestination);
+        this.verifyIncidentMessageApiCall("someErrorMessage", this.typeName, this.integrationName, this.incidentDestination);
     }
 
     @Test

digiwf-task/digiwf-tasklist-service/Dockerfile

@@ -1,7 +1,3 @@
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest
-
-EXPOSE 8080
+FROM registry.access.redhat.com/ubi9/openjdk-17:latest
 
 COPY target/*.jar /deployments/spring-boot-application.jar
-
-CMD "java" ${JAVA_OPTIONS} "-jar" "/deployments/spring-boot-application.jar"