diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml index f50fc6e49618e2f6f4857afe0d484eb5ccfc7b0a..d27f464fcf11fa12cadfed130916a6ff58909b56 100644 --- a/bescheid-manager/pom.xml +++ b/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.21.0-SNAPSHOT</version> + <version>1.22.0-SNAPSHOT</version> <properties> - <vorgang-manager.version>2.18.0-SNAPSHOT</vorgang-manager.version> + <vorgang-manager.version>2.19.0-SNAPSHOT</vorgang-manager.version> <nachrichten-manager.version>2.14.0</nachrichten-manager.version> - <document-manager.version>1.1.0-SNAPSHOT</document-manager.version> + <document-manager.version>1.1.0</document-manager.version> <api-lib.version>0.13.0</api-lib.version> <spring-cloud-config-client.version>4.1.3</spring-cloud-config-client.version> </properties> diff --git a/pom.xml b/pom.xml index 6b7687d7ad095a08ede0e47302cb681c8758f4d8..494b935a4f31039cfce14ab9cbacf431bcb5b818 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.ozgcloud.vorgang</groupId> <artifactId>vorgang-manager</artifactId> - <version>2.18.0-SNAPSHOT</version> + <version>2.19.0-SNAPSHOT</version> <name>OZG-Cloud Vorgang Manager</name> <packaging>pom</packaging> diff --git a/vorgang-manager-base/pom.xml b/vorgang-manager-base/pom.xml index eb2a2716b49b827ecadd7fbbe7b8bd7486d83024..afe96da7cd3359bc2fa4991467310d7b994d8015 100644 --- a/vorgang-manager-base/pom.xml +++ b/vorgang-manager-base/pom.xml @@ -12,7 +12,7 @@ <groupId>de.ozgcloud.vorgang</groupId> <artifactId>vorgang-manager-base</artifactId> - <version>2.18.0-SNAPSHOT</version> + <version>2.19.0-SNAPSHOT</version> <name>OZG-Cloud Vorgang Manager Base</name> @@ -25,7 +25,7 @@ <groupId>org.springframework.security</groupId> <artifactId>spring-security-core</artifactId> </dependency> - + <dependency> <groupId>net.devh</groupId> <artifactId>grpc-server-spring-boot-starter</artifactId> @@ -34,7 +34,7 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-validation</artifactId> </dependency> - + <!-- TEST --> <dependency> <groupId>org.springframework.security</groupId> @@ -42,7 +42,7 @@ <scope>test</scope> </dependency> </dependencies> - + <build> <plugins> <plugin> diff --git a/vorgang-manager-command/pom.xml b/vorgang-manager-command/pom.xml index 0dc8f2f750e5b4e4de4c4855ada0ec9bd6fd2041..f1e36e6db98cea5fbe31d8ebd1ecf8284baef874 100644 --- a/vorgang-manager-command/pom.xml +++ b/vorgang-manager-command/pom.xml @@ -7,16 +7,16 @@ <version>4.5.0</version> <relativePath/> </parent> - + <groupId>de.ozgcloud.command</groupId> <artifactId>command-manager</artifactId> - <version>2.18.0-SNAPSHOT</version> + <version>2.19.0-SNAPSHOT</version> <name>OZG-Cloud Command Manager</name> <properties> <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version> </properties> - + <dependencies> <dependency> <groupId>org.springframework</groupId> @@ -34,7 +34,7 @@ <optional>true</optional> </dependency> </dependencies> - + <build> <plugins> <plugin> diff --git a/vorgang-manager-interface/pom.xml b/vorgang-manager-interface/pom.xml index a03f469c711f6f5003d4c33cfe15ed59fa515fc6..8bdcccf2f74676d845151773d2f72de585a7dcfd 100644 --- a/vorgang-manager-interface/pom.xml +++ b/vorgang-manager-interface/pom.xml @@ -36,7 +36,7 @@ <groupId>de.ozgcloud.vorgang</groupId> <artifactId>vorgang-manager-interface</artifactId> - <version>2.18.0-SNAPSHOT</version> + <version>2.19.0-SNAPSHOT</version> <name>OZG-Cloud Vorgang Manager gRPC Interface</name> <description>Interface (gRPC) for Vorgang Manager Server</description> diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml index af791fe4f3235fd150aba75c9f5378362b77efde..3d13b9acb6f95a0b0d11e1f57a134a87d92ac12e 100644 --- a/vorgang-manager-server/pom.xml +++ b/vorgang-manager-server/pom.xml @@ -38,7 +38,7 @@ <groupId>de.ozgcloud.vorgang</groupId> <artifactId>vorgang-manager-server</artifactId> - <version>2.18.0-SNAPSHOT</version> + <version>2.19.0-SNAPSHOT</version> <name>OZG-Cloud Vorgang Manager Server</name> <description>Server Implementierung des VorgangManagers</description> @@ -53,14 +53,13 @@ <zufi-manager-interface.version>1.4.0</zufi-manager-interface.version> <user-manager-interface.version>2.9.0</user-manager-interface.version> - <bescheid-manager.version>1.21.0-SNAPSHOT</bescheid-manager.version> + <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-SNAPSHOT</ozgcloud-starter.version> + <ozgcloud-starter.version>0.14.0</ozgcloud-starter.version> <notification-manager.version>2.12.0</notification-manager.version> - <collaboration-manager.version>0.5.0-SNAPSHOT</collaboration-manager.version> - <archive-manager.version>0.1.0-SNAPSHOT</archive-manager.version> - <document-manager.version>1.1.0-SNAPSHOT</document-manager.version> + <collaboration-manager.version>0.5.0</collaboration-manager.version> + <document-manager.version>1.1.0</document-manager.version> <zip.version>2.11.5</zip.version> <jsoup.version>1.15.3</jsoup.version> @@ -159,11 +158,6 @@ <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> diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java index 5cc668752eae4480fa6c9c8d4767483ab56db5a6..126443e9add8f118d47eb65f7bdc77e64bbc1cfe 100644 --- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java +++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/TestConfiguration.java @@ -25,19 +25,13 @@ package de.ozgcloud.vorgang; import static org.mockito.Mockito.*; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mail.javamail.JavaMailSender; -import de.ozgcloud.archive.common.callcontext.CallContextProvider; - @Configuration public class TestConfiguration { - @MockBean - private CallContextProvider callContextProvider; - @Bean JavaMailSender mockMailSender() { return mock(JavaMailSender.class); diff --git a/vorgang-manager-utils/pom.xml b/vorgang-manager-utils/pom.xml index 9d550a13a5cc83bb2b13f4dd39290e5718c0f685..7330d4333ae48ad43bf9eded3a874dd40d9f3a3f 100644 --- a/vorgang-manager-utils/pom.xml +++ b/vorgang-manager-utils/pom.xml @@ -37,16 +37,16 @@ <groupId>de.ozgcloud.vorgang</groupId> <artifactId>vorgang-manager-utils</artifactId> <name>OZG-Cloud Vorgang Manager Utils</name> - <version>2.18.0-SNAPSHOT</version> + <version>2.19.0-SNAPSHOT</version> <properties> <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version> <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version> - + <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version> <maven-failsafe-plugin.version>3.2.2</maven-failsafe-plugin.version> <lombok.version>1.18.34</lombok.version> - + </properties> <dependencies>