Skip to content

Commit

Permalink
bump jdk to 21
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonhir
simonhir committed Jun 26, 2024
1 parent 21db176 commit b06d56c
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/workflow-build-services.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow-bump-version.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .java-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17
21
2 changes: 1 addition & 1 deletion digiwf-connector/digiwf-camunda-connector-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-engine/digiwf-engine-rest-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-engine/digiwf-engine-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-gateway/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion digiwf-integrations/digiwf-ticket-integration/digiwf-ticket-integration-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ...lization-core/src/test/java/de/muenchen/oss/digiwf/json/validation/JsonValidatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)");

}

Expand Down
2 changes: 1 addition & 1 deletion digiwf-task/digiwf-tasklist-service/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<url>https://github.com/it-at-m/digiwf-core</url>

<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<lombok.version>1.18.32</lombok.version>
<lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
Expand Down

0 comments on commit b06d56c

Please sign in to comment.