Skip to content
Snippets Groups Projects
Commit a938e3b0 authored by Krzysztof Witukiewicz's avatar Krzysztof Witukiewicz
Browse files

Merge remote-tracking branch 'origin/main' into OZG-6706-remove-bescheid-manager 

# Conflicts:
#	bescheid-manager/pom.xml
#	vorgang-manager-server/pom.xml
parents 6a057e12 fcbb3270
Branches
Tags
1 merge request!7Ozg-6706 remove bescheid manager
Show whitespace changes
Inline Side-by-side
pom.xml
+ 5
− 3
View file @ a938e3b0
......@@ -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>
......
vorgang-manager-base/pom.xml
+ 2
− 2
View file @ a938e3b0
......@@ -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>
......
vorgang-manager-command/pom.xml
+ 7
− 5
View file @ a938e3b0
......@@ -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>
......
vorgang-manager-interface/pom.xml
+ 9
− 6
View file @ a938e3b0
......@@ -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>
......
vorgang-manager-server/pom.xml
+ 7
− 7
View file @ a938e3b0
......@@ -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>
......@@ -54,12 +54,12 @@
<user-manager-interface.version>2.12.0</user-manager-interface.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>
......
vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandServiceTest.java
+ 4
− 3
View file @ a938e3b0
......@@ -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);
}
......
vorgang-manager-utils/pom.xml
+ 7
− 5
View file @ a938e3b0
......@@ -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% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit