From b06d56cc50f27fc2be17b83ec97544db15c2b5b9 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter Date: Wed, 26 Jun 2024 16:10:26 +0200 Subject: [PATCH] bump jdk to 21 --- .github/workflows/workflow-build-services.yaml | 4 ++-- .github/workflows/workflow-bump-version.yaml | 2 +- .java-version | 2 +- digiwf-connector/digiwf-camunda-connector-service/Dockerfile | 2 +- digiwf-engine/digiwf-engine-rest-service/Dockerfile | 2 +- digiwf-engine/digiwf-engine-service/Dockerfile | 2 +- digiwf-gateway/Dockerfile | 2 +- .../digiwf-address-integration-service/Dockerfile | 2 +- .../digiwf-alw-integration-service/Dockerfile | 2 +- .../digiwf-cosys-integration-service/Dockerfile | 2 +- .../digiwf-dms-integration-service/Dockerfile | 2 +- .../digiwf-email-integration-service/Dockerfile | 2 +- .../digiwf-okewo-integration-service/Dockerfile | 2 +- .../digiwf-s3-integration-service/Dockerfile | 2 +- .../digiwf-ticket-integration-service/Dockerfile | 2 +- .../oss/digiwf/json/validation/JsonValidatorTest.java | 2 +- digiwf-task/digiwf-tasklist-service/Dockerfile | 2 +- pom.xml | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/workflow-build-services.yaml b/.github/workflows/workflow-build-services.yaml index 9ed4944a3d..43b10ef809 100644 --- a/.github/workflows/workflow-build-services.yaml +++ b/.github/workflows/workflow-build-services.yaml @@ -37,7 +37,7 @@ jobs: - name: Install Java and Maven uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'adopt' cache: "maven" server-id: "central" @@ -218,7 +218,7 @@ jobs: - name: Install Java and Maven uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'adopt' server-id: camunda-bpm-nexus-ee server-username: CAMUNDA_USER_REF diff --git a/.github/workflows/workflow-bump-version.yaml b/.github/workflows/workflow-bump-version.yaml index b50fdc8d7d..d0e5daafa1 100644 --- a/.github/workflows/workflow-bump-version.yaml +++ b/.github/workflows/workflow-bump-version.yaml @@ -60,7 +60,7 @@ jobs: if: inputs.bump-services-version== true uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'adopt' - name: Raise mvn version diff --git a/.java-version b/.java-version index 98d9bcb75a..aabe6ec390 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -17 +21 diff --git a/digiwf-connector/digiwf-camunda-connector-service/Dockerfile b/digiwf-connector/digiwf-camunda-connector-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-connector/digiwf-camunda-connector-service/Dockerfile +++ b/digiwf-connector/digiwf-camunda-connector-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-engine/digiwf-engine-rest-service/Dockerfile b/digiwf-engine/digiwf-engine-rest-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-engine/digiwf-engine-rest-service/Dockerfile +++ b/digiwf-engine/digiwf-engine-rest-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-engine/digiwf-engine-service/Dockerfile b/digiwf-engine/digiwf-engine-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-engine/digiwf-engine-service/Dockerfile +++ b/digiwf-engine/digiwf-engine-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-gateway/Dockerfile b/digiwf-gateway/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-gateway/Dockerfile +++ b/digiwf-gateway/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service/Dockerfile b/digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service/Dockerfile +++ b/digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/Dockerfile b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/Dockerfile +++ b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/Dockerfile b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/Dockerfile +++ b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/Dockerfile b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/Dockerfile +++ b/digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/Dockerfile b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/Dockerfile +++ b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service/Dockerfile b/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service/Dockerfile +++ b/digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/Dockerfile b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/Dockerfile +++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-integrations/digiwf-ticket-integration/digiwf-ticket-integration-service/Dockerfile b/digiwf-integrations/digiwf-ticket-integration/digiwf-ticket-integration-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-integrations/digiwf-ticket-integration/digiwf-ticket-integration-service/Dockerfile +++ b/digiwf-integrations/digiwf-ticket-integration/digiwf-ticket-integration-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/src/test/java/de/muenchen/oss/digiwf/json/validation/JsonValidatorTest.java b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/src/test/java/de/muenchen/oss/digiwf/json/validation/JsonValidatorTest.java index 1cc741a8dd..a4b6a2d15f 100644 --- a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/src/test/java/de/muenchen/oss/digiwf/json/validation/JsonValidatorTest.java +++ b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/src/test/java/de/muenchen/oss/digiwf/json/validation/JsonValidatorTest.java @@ -127,7 +127,7 @@ public void objekt_schema_without_additionalPropperties_fails() throws IOExcepti this.validationService.validate(new JSONObject(rawSchema).toMap(), acutalData); }); - assertThat(exception.getMessage()).contains("ValidationErrorInformation(pointer=#/objekt1, schemaPath=#/allOf/0/allOf/1/properties/objekt1, violatedSchema={\"type\":\"object\",\"additionalProperties\":false,\"title\":\"Dynamisches Objekt\",\"description\":\"fsdafsdafsad\",\"x-rules\":[],\"fieldType\":\"object\",\"x-options\":{\"fieldColProps\":{\"messages\":{},\"cols\":12,\"sm\":12}},\"key\":\"d6d8d7a1-e812-42ac-9135-8242f93b6158\",\"x-props\":{\"outlined\":true,\"dense\":true},\"properties\":{\"objektSchalter\":{\"title\":\"Schalter\",\"x-rules\":[],\"x-display\":\"switch\",\"x-options\":{\"fieldColProps\":{\"messages\":{},\"cols\":12,\"sm\":12}},\"fieldType\":\"switch\",\"key\":\"ObjektSchalter\",\"x-props\":{\"outlined\":true,\"dense\":true},\"type\":\"boolean\"},\"objektTextfeld\":{\"type\":\"string\",\"title\":\"Textfeld\",\"x-rules\":[],\"fieldType\":\"text\",\"x-options\":{\"fieldColProps\":{\"messages\":{},\"cols\":12,\"sm\":12}},\"key\":\"objektTextfeld\",\"x-props\":{\"outlined\":true,\"dense\":true}}}}, message=#/objekt1: extraneous key [objektTextfeld1] is not permitted)"); + assertThat(exception.getMessage()).contains("ValidationErrorInformation(pointer=#/objekt1, schemaPath=#/allOf/0/allOf/1/properties/objekt1, violatedSchema={\"type\":\"object\",\"additionalProperties\":false,\"title\":\"Dynamisches Objekt\",\"description\":\"fsdafsdafsad\",\"x-rules\":[],\"fieldType\":\"object\",\"x-options\":{\"fieldColProps\":{\"messages\":{},\"cols\":12,\"sm\":12}},\"key\":\"d6d8d7a1-e812-42ac-9135-8242f93b6158\",\"x-props\":{\"outlined\":true,\"dense\":true},\"properties\":{\"objektSchalter\":{\"title\":\"Schalter\",\"x-rules\":[],\"x-display\":\"switch\",\"fieldType\":\"switch\",\"x-options\":{\"fieldColProps\":{\"messages\":{},\"cols\":12,\"sm\":12}},\"key\":\"ObjektSchalter\",\"x-props\":{\"outlined\":true,\"dense\":true},\"type\":\"boolean\"},\"objektTextfeld\":{\"type\":\"string\",\"title\":\"Textfeld\",\"x-rules\":[],\"fieldType\":\"text\",\"x-options\":{\"fieldColProps\":{\"messages\":{},\"cols\":12,\"sm\":12}},\"key\":\"objektTextfeld\",\"x-props\":{\"outlined\":true,\"dense\":true}}}}, message=#/objekt1: extraneous key [objektTextfeld1] is not permitted)"); } diff --git a/digiwf-task/digiwf-tasklist-service/Dockerfile b/digiwf-task/digiwf-tasklist-service/Dockerfile index f8e83f3a2f..d7540e4928 100644 --- a/digiwf-task/digiwf-tasklist-service/Dockerfile +++ b/digiwf-task/digiwf-tasklist-service/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.access.redhat.com/ubi9/openjdk-17:latest +FROM registry.access.redhat.com/ubi9/openjdk-21:latest COPY target/*.jar /deployments/spring-boot-application.jar diff --git a/pom.xml b/pom.xml index 4469b4e456..4ec3eb7928 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ https://github.com/it-at-m/digiwf-core - 17 + 21 UTF-8 1.18.32 0.2.0