From 556883e66866421469f41bfafa2671c5b259c776 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Sat, 30 Mar 2024 11:37:50 +0100
Subject: [PATCH] OZG-5220 update to java 21
---
Jenkinsfile | 2 +-
bescheid-manager/pom.xml | 7 ++++++-
.../bayernid-proxy-interface/pom.xml | 4 ++--
nachrichten-bayernid-proxy/pom.xml | 4 ++--
nachrichten-manager/pom.xml | 4 ++--
notification-manager/pom.xml | 2 +-
vorgang-manager-base/pom.xml | 2 +-
vorgang-manager-command/pom.xml | 2 +-
vorgang-manager-interface/pom.xml | 4 ++--
vorgang-manager-server/pom.xml | 4 ++--
.../common/search/SearchVorgangCustomRepositoryImpl.java | 2 +-
.../search/SearchVorgangCustomRepositoryImplTest.java | 2 +-
vorgang-manager-utils/pom.xml | 2 +-
13 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b03522c90..9364c4109 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
pipeline {
agent {
node {
- label 'ozgcloud-jenkins-build-agent'
+ label 'ozgcloud-jenkins-build-agent-jdk21'
}
}
diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml
index fd101d6c1..fef1bdb65 100644
--- a/bescheid-manager/pom.xml
+++ b/bescheid-manager/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath />
</parent>
@@ -61,6 +61,11 @@
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-inprocess</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
diff --git a/nachrichten-bayernid-proxy/bayernid-proxy-interface/pom.xml b/nachrichten-bayernid-proxy/bayernid-proxy-interface/pom.xml
index d2714d760..ad48eb69f 100644
--- a/nachrichten-bayernid-proxy/bayernid-proxy-interface/pom.xml
+++ b/nachrichten-bayernid-proxy/bayernid-proxy-interface/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -44,7 +44,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>17</java.version>
+ <java.version>21</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
diff --git a/nachrichten-bayernid-proxy/pom.xml b/nachrichten-bayernid-proxy/pom.xml
index 63a3f81c8..f4c8561b3 100644
--- a/nachrichten-bayernid-proxy/pom.xml
+++ b/nachrichten-bayernid-proxy/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -51,7 +51,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>17</java.version>
+ <java.version>21</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<jaxb-maven-plugin.version>4.0.0</jaxb-maven-plugin.version>
diff --git a/nachrichten-manager/pom.xml b/nachrichten-manager/pom.xml
index 0fcf2ff52..c550235a3 100644
--- a/nachrichten-manager/pom.xml
+++ b/nachrichten-manager/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -40,7 +40,7 @@
<name>OZG-Cloud Nachrichten Manager</name>
<properties>
- <java.version>17</java.version>
+ <java.version>21</java.version>
<!-- TODO version management -->
<shedlock.version>4.25.0</shedlock.version>
<logcaptor.version>2.7.10</logcaptor.version>
diff --git a/notification-manager/pom.xml b/notification-manager/pom.xml
index b04650d48..cf193987b 100644
--- a/notification-manager/pom.xml
+++ b/notification-manager/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/vorgang-manager-base/pom.xml b/vorgang-manager-base/pom.xml
index 8fe7c15b6..c72fb6bd6 100644
--- a/vorgang-manager-base/pom.xml
+++ b/vorgang-manager-base/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath />
</parent>
diff --git a/vorgang-manager-command/pom.xml b/vorgang-manager-command/pom.xml
index 704ae1f3d..b9c61f4c1 100644
--- a/vorgang-manager-command/pom.xml
+++ b/vorgang-manager-command/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/vorgang-manager-interface/pom.xml b/vorgang-manager-interface/pom.xml
index e87c9b6a4..a1fd94abb 100644
--- a/vorgang-manager-interface/pom.xml
+++ b/vorgang-manager-interface/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -45,7 +45,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>17</java.version>
+ <java.version>21</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index 21bd4a509..6d1c91fce 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath />
</parent>
@@ -44,7 +44,7 @@
<description>Server Implementierung des VorgangManagers</description>
<properties>
- <java.version>17</java.version>
+ <java.version>21</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.build-image.imageName>docker.ozg-sh.de/vorgang-manager:build-latest</spring-boot.build-image.imageName>
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/search/SearchVorgangCustomRepositoryImpl.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/search/SearchVorgangCustomRepositoryImpl.java
index 0e6995525..cfd983a28 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/search/SearchVorgangCustomRepositoryImpl.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/search/SearchVorgangCustomRepositoryImpl.java
@@ -44,10 +44,10 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.elasticsearch.client.elc.NativeQueryBuilder;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.data.elasticsearch.core.RefreshPolicy;
-import org.springframework.data.elasticsearch.core.ScriptType;
import org.springframework.data.elasticsearch.core.SearchHit;
import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.data.elasticsearch.core.document.Document;
+import org.springframework.data.elasticsearch.core.query.ScriptType;
import org.springframework.data.elasticsearch.core.query.UpdateQuery;
import org.springframework.data.support.PageableExecutionUtils;
import org.springframework.stereotype.Repository;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchVorgangCustomRepositoryImplTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchVorgangCustomRepositoryImplTest.java
index 5df124809..4932e5879 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchVorgangCustomRepositoryImplTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchVorgangCustomRepositoryImplTest.java
@@ -47,11 +47,11 @@ import org.springframework.data.domain.Sort;
import org.springframework.data.elasticsearch.client.elc.NativeQuery;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.data.elasticsearch.core.IndexOperations;
-import org.springframework.data.elasticsearch.core.ScriptType;
import org.springframework.data.elasticsearch.core.SearchHit;
import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.data.elasticsearch.core.document.Document;
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.query.ScriptType;
import org.springframework.data.elasticsearch.core.query.UpdateQuery;
import de.ozgcloud.vorgang.callcontext.UserTestFactory;
diff --git a/vorgang-manager-utils/pom.xml b/vorgang-manager-utils/pom.xml
index d9bc8f4c0..c13a8cbe3 100644
--- a/vorgang-manager-utils/pom.xml
+++ b/vorgang-manager-utils/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath/>
</parent>
--
GitLab