Skip to content
Snippets Groups Projects
Commit f12f9cc7 authored by Felix Reichenbach's avatar Felix Reichenbach
Browse files

Merge branch 'main' into OZG-7515-migrate-patch-item-command

parents bd988b56 fcbb3270
No related branches found
No related tags found
1 merge request!11Ozg 7515 migrate patch item command
......@@ -30,20 +30,20 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
<version>4.9.0-SNAPSHOT</version>
<version>4.9.0</version>
<relativePath />
</parent>
<groupId>de.ozgcloud.bescheid</groupId>
<artifactId>bescheid-manager</artifactId>
<name>OZG-Cloud Bescheid Manager</name>
<version>1.24.0-SNAPSHOT</version>
<version>1.25.0-SNAPSHOT</version>
<inceptionYear>2020</inceptionYear>
<properties>
<vorgang-manager.version>2.20.0-SNAPSHOT</vorgang-manager.version>
<nachrichten-manager.version>2.16.0-SNAPSHOT</nachrichten-manager.version>
<document-manager.version>1.2.0-SNAPSHOT</document-manager.version>
<vorgang-manager.version>2.22.0-SNAPSHOT</vorgang-manager.version>
<nachrichten-manager.version>2.16.0</nachrichten-manager.version>
<document-manager.version>1.2.0</document-manager.version>
<api-lib.version>0.14.0</api-lib.version>
<spring-cloud-config-client.version>4.2.0</spring-cloud-config-client.version>
</properties>
......@@ -143,7 +143,8 @@
</dependency>
<!--dev tools-->
<!--dev
tools-->
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
......
......@@ -24,12 +24,14 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager</artifactId>
<version>2.21.0-SNAPSHOT</version>
<version>2.22.0-SNAPSHOT</version>
<name>OZG-Cloud Vorgang Manager</name>
<packaging>pom</packaging>
......
......@@ -31,13 +31,13 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
<version>4.9.0-SNAPSHOT</version>
<version>4.9.0</version>
<relativePath />
</parent>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-base</artifactId>
<version>2.21.0-SNAPSHOT</version>
<version>2.22.0-SNAPSHOT</version>
<name>OZG-Cloud Vorgang Manager Base</name>
<inceptionYear>2020</inceptionYear>
......
......@@ -24,18 +24,20 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
<version>4.9.0-SNAPSHOT</version>
<version>4.9.0</version>
<relativePath />
</parent>
<groupId>de.ozgcloud.command</groupId>
<artifactId>command-manager</artifactId>
<version>2.21.0-SNAPSHOT</version>
<version>2.22.0-SNAPSHOT</version>
<name>OZG-Cloud Command Manager</name>
<inceptionYear>2020</inceptionYear>
......
......@@ -24,19 +24,21 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
<version>4.9.0-SNAPSHOT</version>
<version>4.9.0</version>
<relativePath />
</parent>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-interface</artifactId>
<version>2.21.0-SNAPSHOT</version>
<version>2.22.0-SNAPSHOT</version>
<name>OZG-Cloud Vorgang Manager gRPC Interface</name>
<description>Interface (gRPC) for Vorgang Manager Server</description>
......@@ -110,7 +112,8 @@
</outputTarget>
<outputTarget>
<type>grpc-java</type>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen.version}</pluginArtifact>
<pluginArtifact>
io.grpc:protoc-gen-grpc-java:${protoc-gen.version}</pluginArtifact>
</outputTarget>
</outputTargets>
</configuration>
......
......@@ -32,13 +32,13 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
<version>4.9.0-SNAPSHOT</version>
<version>4.9.0</version>
<relativePath />
</parent>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-server</artifactId>
<version>2.21.0-SNAPSHOT</version>
<version>2.22.0-SNAPSHOT</version>
<name>OZG-Cloud Vorgang Manager Server</name>
<description>Server Implementierung des VorgangManagers</description>
......@@ -53,14 +53,14 @@
<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.24.0-SNAPSHOT</bescheid-manager.version>
<bescheid-manager.version>1.25.0-SNAPSHOT</bescheid-manager.version>
<processor-manager.version>0.5.0</processor-manager.version>
<nachrichten-manager.version>2.17.0-SNAPSHOT</nachrichten-manager.version>
<api-lib.version>0.16.0-SNAPSHOT</api-lib.version>
<notification-manager.version>2.15.0-SNAPSHOT</notification-manager.version>
<nachrichten-manager.version>2.17.0</nachrichten-manager.version>
<api-lib.version>0.16.0</api-lib.version>
<notification-manager.version>2.15.0</notification-manager.version>
<collaboration-manager.version>0.7.0</collaboration-manager.version>
<archive-manager.version>0.2.0-SNAPSHOT</archive-manager.version>
<document-manager.version>1.2.0-SNAPSHOT</document-manager.version>
<archive-manager.version>0.2.0</archive-manager.version>
<document-manager.version>1.2.0</document-manager.version>
<zip.version>2.11.5</zip.version>
<jsoup.version>1.15.3</jsoup.version>
......
......@@ -188,7 +188,8 @@ class PersistPostfachNachrichtByCommandServiceTest {
@Test
void shouldThrowException() {
assertThatThrownBy(() -> service.findAnswers(serviceKontoType, PostfachAddressTestFactory.STRING_BASED_IDENTIFIER_POSTFACH_ID_VALUE,
assertThatThrownBy(
() -> service.findAnswers(serviceKontoType, PostfachAddressTestFactory.IDENTIFIER.toString(),
GrpcPostfachMailTestFactory.REFERENCED_NACHRICHT_ID))
.isInstanceOf(UnsupportedOperationException.class);
}
......
......@@ -24,20 +24,22 @@
unter der Lizenz sind dem Lizenztext zu entnehmen.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
<version>4.9.0-SNAPSHOT</version>
<version>4.9.0</version>
<relativePath />
</parent>
<groupId>de.ozgcloud.vorgang</groupId>
<artifactId>vorgang-manager-utils</artifactId>
<name>OZG-Cloud Vorgang Manager Utils</name>
<version>2.21.0-SNAPSHOT</version>
<version>2.22.0-SNAPSHOT</version>
<inceptionYear>2020</inceptionYear>
<properties>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment