Merge branch 'master' into OZG-6990-VorgangAufInArchivierungSetzen

# Conflicts:
#	vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CallContextHandleInterceptorTest.java
#	vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/VorgangManagerClientCallContextAttachingInterceptorTest.java
#	vorgang-manager-server/pom.xml

vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/VorgangManagerClientCallContextAttachingInterceptorTest.java

@@ -23,6 +23,7 @@
  */
 package de.ozgcloud.vorgang.callcontext;
 
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
 import static de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;

vorgang-manager-server/pom.xml

@@ -56,7 +56,7 @@
 		<bescheid-manager.version>1.22.0-SNAPSHOT</bescheid-manager.version>
 		<processor-manager.version>0.5.0</processor-manager.version>
 		<nachrichten-manager.version>2.14.1</nachrichten-manager.version>
-		<api-lib.version>0.14.0</api-lib.version>
+		<api-lib.version>0.15.0-SNAPSHOT</api-lib.version>
 		<notification-manager.version>2.12.0</notification-manager.version>
 		<collaboration-manager.version>0.6.0-SNAPSHOT</collaboration-manager.version>
 		<archive-manager.version>0.1.0-SNAPSHOT</archive-manager.version>
@@ -169,6 +169,16 @@
 			<artifactId>document-manager-server</artifactId>
 			<version>${document-manager.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>de.ozgcloud.api-lib</groupId>
+			<artifactId>ozg-cloud-spring-boot-starter</artifactId>
+			<version>${api-lib.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>de.ozgcloud.api-lib</groupId>
+			<artifactId>api-lib-core</artifactId>
+			<version>${api-lib.version}</version>
+		</dependency>
 
 		<!-- Spring -->
 		<dependency>
@@ -226,17 +236,6 @@
 			<version>${shedlock.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.thedeanda</groupId>
-			<artifactId>lorem</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.github.javafaker</groupId>
-			<artifactId>javafaker</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.mapstruct</groupId>
 			<artifactId>mapstruct</artifactId>
@@ -369,6 +368,16 @@
 			<artifactId>awaitility</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.thedeanda</groupId>
+			<artifactId>lorem</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.github.javafaker</groupId>
+			<artifactId>javafaker</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 		<!-- mongock -->
 		<dependency>

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/user/VorgangManagerCallContextAttachingInterceptorTest.java

 package de.ozgcloud.vorgang.user;
 
 import static de.ozgcloud.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.KEY_REQUEST_ID;
 import static de.ozgcloud.vorgang.user.VorgangManagerCallContextAttachingInterceptor.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;