Merge pull request 'OZG-7143 GrpcBinaryFileServerDownloader läuft ins Timeout'...

Merge pull request 'OZG-7143 GrpcBinaryFileServerDownloader läuft ins Timeout' (#511) from OZG-7143-download-timeout into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/vorgang-manager/pulls/511


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

bescheid-manager/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.5.0</version>
+		<version>4.7.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 

vorgang-manager-base/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.5.0</version>
+		<version>4.7.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 

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

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

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

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

vorgang-manager-command/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.5.0</version>
+		<version>4.7.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 

vorgang-manager-interface/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.5.0</version>
+		<version>4.7.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 

vorgang-manager-server/pom.xml

@@ -32,7 +32,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.5.0</version>
+		<version>4.7.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
@@ -56,9 +56,10 @@
 		<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>
-		<ozgcloud-starter.version>0.14.0</ozgcloud-starter.version>
+		<api-lib.version>0.15.0-SNAPSHOT</api-lib.version>
 		<notification-manager.version>2.12.0</notification-manager.version>
-		<collaboration-manager.version>0.5.0</collaboration-manager.version>
+		<collaboration-manager.version>0.6.0-SNAPSHOT</collaboration-manager.version>
+		<archive-manager.version>0.1.0-SNAPSHOT</archive-manager.version>
 		<document-manager.version>1.1.0</document-manager.version>
 
 		<zip.version>2.11.5</zip.version>
@@ -158,11 +159,26 @@
 			<artifactId>collaboration-manager-server</artifactId>
 			<version>${collaboration-manager.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>de.ozgcloud.archive</groupId>
+			<artifactId>archive-manager-server</artifactId>
+			<version>${archive-manager.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>de.ozgcloud.document</groupId>
 			<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>
@@ -220,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>
@@ -293,12 +298,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>de.ozgcloud.api-lib</groupId>
-			<artifactId>ozg-cloud-spring-boot-starter</artifactId>
-			<version>${ozgcloud-starter.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -358,6 +357,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.*;

vorgang-manager-utils/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.5.0</version>
+		<version>4.7.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>