Merge branch 'master' into merge-hotfix

# Conflicts:
#	bescheid-manager/pom.xml
#	pom.xml
#	vorgang-manager-base/pom.xml
#	vorgang-manager-command/pom.xml
#	vorgang-manager-interface/pom.xml
#	vorgang-manager-server/pom.xml
#	vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
#	vorgang-manager-utils/pom.xml

bescheid-manager/pom.xml

@@ -12,12 +12,12 @@
 	<groupId>de.ozgcloud.bescheid</groupId>
 	<artifactId>bescheid-manager</artifactId>
 	<name>OZG-Cloud Bescheid Manager</name>
-	<version>1.22.1</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<inceptionYear>2020</inceptionYear>
 
 	<properties>
-		<vorgang-manager.version>2.19.1</vorgang-manager.version>
-		<nachrichten-manager.version>2.14.0</nachrichten-manager.version>
+		<vorgang-manager.version>2.20.0-SNAPSHOT</vorgang-manager.version>
+		<nachrichten-manager.version>2.16.0-SNAPSHOT</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>

pom.xml

@@ -29,7 +29,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.ozgcloud.vorgang</groupId>
 	<artifactId>vorgang-manager</artifactId>
-	<version>2.19.1</version>
+	<version>2.20.0-SNAPSHOT</version>
 
 	<name>OZG-Cloud Vorgang Manager</name>
 	<packaging>pom</packaging>

vorgang-manager-base/pom.xml

@@ -12,7 +12,7 @@
 
 	<groupId>de.ozgcloud.vorgang</groupId>
 	<artifactId>vorgang-manager-base</artifactId>
-	<version>2.19.1</version>
+	<version>2.20.0-SNAPSHOT</version>
 
 	<name>OZG-Cloud Vorgang Manager Base</name>
 	<inceptionYear>2020</inceptionYear>

vorgang-manager-command/pom.xml

@@ -10,7 +10,7 @@
 
 	<groupId>de.ozgcloud.command</groupId>
 	<artifactId>command-manager</artifactId>
-	<version>2.19.1</version>
+	<version>2.20.0-SNAPSHOT</version>
 	<name>OZG-Cloud Command Manager</name>
 	<inceptionYear>2020</inceptionYear>
 

vorgang-manager-interface/pom.xml

@@ -36,7 +36,7 @@
 
 	<groupId>de.ozgcloud.vorgang</groupId>
 	<artifactId>vorgang-manager-interface</artifactId>
-	<version>2.19.1</version>
+	<version>2.20.0-SNAPSHOT</version>
 
 	<name>OZG-Cloud Vorgang Manager gRPC Interface</name>
 	<description>Interface (gRPC) for Vorgang Manager Server</description>

vorgang-manager-server/pom.xml

@@ -38,7 +38,7 @@
 
 	<groupId>de.ozgcloud.vorgang</groupId>
 	<artifactId>vorgang-manager-server</artifactId>
-	<version>2.19.1</version>
+	<version>2.20.0-SNAPSHOT</version>
 
 	<name>OZG-Cloud Vorgang Manager Server</name>
 	<description>Server Implementierung des VorgangManagers</description>
@@ -53,11 +53,11 @@
 		<zufi-manager-interface.version>1.6.0</zufi-manager-interface.version>
 
 		<user-manager-interface.version>2.12.0</user-manager-interface.version>
-		<bescheid-manager.version>1.22.0</bescheid-manager.version>
+		<bescheid-manager.version>1.23.0-SNAPSHOT</bescheid-manager.version>
 		<processor-manager.version>0.5.0</processor-manager.version>
-		<nachrichten-manager.version>2.14.1</nachrichten-manager.version>
+		<nachrichten-manager.version>2.16.0-SNAPSHOT</nachrichten-manager.version>
 		<api-lib.version>0.15.0</api-lib.version>
-		<notification-manager.version>2.13.0</notification-manager.version>
+		<notification-manager.version>2.14.0-SNAPSHOT</notification-manager.version>
 		<collaboration-manager.version>0.6.0</collaboration-manager.version>
 		<archive-manager.version>0.1.0</archive-manager.version>
 		<document-manager.version>1.1.0</document-manager.version>

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

@@ -238,7 +238,7 @@ class CollaborationITCase {
 	}
 
 	private void waitUntilCommandHasStatus(String commandId, CommandStatus status) {
-		await().atMost(600, TimeUnit.SECONDS).until(
+		await().atMost(70, TimeUnit.SECONDS).until(
 				() -> mongoOperations.findById(commandId, Command.class),
 				command -> command.getStatus() == status);
 	}

vorgang-manager-utils/pom.xml

@@ -37,7 +37,7 @@
 	<groupId>de.ozgcloud.vorgang</groupId>
 	<artifactId>vorgang-manager-utils</artifactId>
 	<name>OZG-Cloud Vorgang Manager Utils</name>
-	<version>2.19.1</version>
+	<version>2.20.0-SNAPSHOT</version>
 	<inceptionYear>2020</inceptionYear>
 
 	<properties>