Merge pull request 'merge-hotfix' (#526) from merge-hotfix into master

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

bescheid-manager/pom.xml

@@ -17,7 +17,7 @@
 
 	<properties>
 		<vorgang-manager.version>2.20.0-SNAPSHOT</vorgang-manager.version>
-		<nachrichten-manager.version>2.16.0-SNAPSHOT</nachrichten-manager.version>
+		<nachrichten-manager.version>2.15.0</nachrichten-manager.version>
 		<document-manager.version>1.1.0</document-manager.version>
 		<api-lib.version>0.14.0</api-lib.version>
 		<spring-cloud-config-client.version>4.1.3</spring-cloud-config-client.version>

vorgang-manager-server/pom.xml

@@ -55,7 +55,7 @@
 		<user-manager-interface.version>2.12.0</user-manager-interface.version>
 		<bescheid-manager.version>1.23.0-SNAPSHOT</bescheid-manager.version>
 		<processor-manager.version>0.5.0</processor-manager.version>
-		<nachrichten-manager.version>2.16.0-SNAPSHOT</nachrichten-manager.version>
+		<nachrichten-manager.version>2.15.0</nachrichten-manager.version>
 		<api-lib.version>0.15.0</api-lib.version>
 		<notification-manager.version>2.14.0-SNAPSHOT</notification-manager.version>
 		<collaboration-manager.version>0.6.0</collaboration-manager.version>

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java

@@ -331,7 +331,9 @@ class CollaborationITCase {
 
 				waitUntilCommandHasStatus(command.getId(), CommandStatus.ERROR);
 
-				await().atMost(70, TimeUnit.SECONDS).untilAsserted(() -> assertThat(loadCollaborationRequest(vorgangId)).isEmpty());
+				await().atMost(60, TimeUnit.SECONDS).untilAsserted(() -> {
+					assertThat(loadCollaborationRequest(vorgangId)).isEmpty();
+				});
 			}
 		}