Merge remote-tracking branch 'origin/master' into OZG-5286_eingang-A12

# Conflicts:
#	pom.xml

Jenkinsfile

 pipeline {
     agent {
        node {
-           label 'ozgcloud-jenkins-build-agent'
+           label 'ozgcloud-jenkins-build-agent-jdk21'
         }
     }
 

common/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>common</artifactId>

enterprise-adapter/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>enterprise-adapter</artifactId>
 	<name>EM - Enterprise Interface Adapter</name>

formcycle-adapter/formcycle-adapter-impl/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>formcycle-adapter</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

formcycle-adapter/formcycle-adapter-interface/pom.xml

@@ -29,18 +29,18 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>3.0.0</version>
+		<version>4.0.1</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>de.ozgcloud.eingang</groupId>
 	<artifactId>formcycle-adapter-interface</artifactId>
 	<name>EM - Formcycle Adapter - Interface</name>
-	<version>2.4.0-SNAPSHOT</version>
+	<version>2.6.0-SNAPSHOT</version>
 	
 	<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>

formcycle-adapter/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>formcycle-adapter</artifactId>

formsolutions-adapter/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

forwarder/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -50,7 +50,6 @@
 		<dependency>
 			<groupId>de.ozgcloud.eingang</groupId>
 			<artifactId>router</artifactId>
-			<version>${vorgang-manager.version}</version>
 		</dependency>
 
 		<!-- spring -->
@@ -58,6 +57,10 @@
 			<groupId>net.devh</groupId>
 			<artifactId>grpc-server-spring-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-inprocess</artifactId>
+		</dependency>
 
 		<!-- Tools -->
 		<dependency>

intelliform-adapter/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

pom.xml

@@ -31,13 +31,13 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>3.0.0</version>
+		<version>4.0.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<groupId>de.ozgcloud.eingang</groupId>
 	<artifactId>eingang-manager</artifactId>
-	<version>2.4.0-SNAPSHOT</version>
+	<version>2.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>OZG-Cloud Eingang Manager</name>
 
@@ -54,8 +54,7 @@
 	</modules>
 
 	<properties>
-		<mapstruct.version>1.4.2.Final</mapstruct.version>
-
+		<vorgang-manager.version>2.4.0</vorgang-manager.version>
 		<vorgang-manager.version>2.4.0</vorgang-manager.version>
 
 		<jsoup.version>1.14.3</jsoup.version>

router/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -56,6 +56,10 @@
 			<groupId>net.devh</groupId>
 			<artifactId>grpc-client-spring-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-inprocess</artifactId>
+		</dependency>
 
 		<!-- Tools -->
 		<dependency>

semantik-adapter/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>semantik-adapter</artifactId>

xta-adapter/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>xta-adapter</artifactId>
 	<name>Eingangs Adapter - XTA</name>