From 643330940d01b67ddc546de11fde51b64f36260c Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 21 Mar 2024 11:05:24 +0100
Subject: [PATCH] OZG-5217 update to java 21
---
formcycle-adapter/formcycle-adapter-interface/pom.xml | 4 ++--
forwarder/pom.xml | 1 -
pom.xml | 8 ++++++--
...framework.boot.autoconfigure.AutoConfiguration.imports | 1 -
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/formcycle-adapter/formcycle-adapter-interface/pom.xml b/formcycle-adapter/formcycle-adapter-interface/pom.xml
index 097ea2fba..82a2b6b61 100644
--- a/formcycle-adapter/formcycle-adapter-interface/pom.xml
+++ b/formcycle-adapter/formcycle-adapter-interface/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>3.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -40,7 +40,7 @@
<properties>
<vorgang-manager.version>2.0.0</vorgang-manager.version>
- <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>
</properties>
diff --git a/forwarder/pom.xml b/forwarder/pom.xml
index 4d68cfca0..98f9d5083 100644
--- a/forwarder/pom.xml
+++ b/forwarder/pom.xml
@@ -50,7 +50,6 @@
<dependency>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>router</artifactId>
- <version>${vorgang-manager.version}</version>
</dependency>
<!-- spring -->
diff --git a/pom.xml b/pom.xml
index f10f9c5ca..8b6800966 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>3.0.0</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -181,7 +181,11 @@
</pluginManagement>
<plugins>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.6.1</version>
+ </plugin>
</plugins>
</build>
diff --git a/router/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/router/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 099d75998..af6ec7fb2 100644
--- a/router/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/router/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -2,5 +2,4 @@ net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration
net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration
net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration
net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration
-net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration
net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration
\ No newline at end of file
--
GitLab