diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml
index 32ccbe338e65c0a0217e1638bfa98246553ccd79..0f948550c5fb83d4525cc8d8ee4984426e13b35a 100644
--- a/bescheid-manager/pom.xml
+++ b/bescheid-manager/pom.xml
@@ -15,9 +15,9 @@
<version>1.18.0-SNAPSHOT</version>
<properties>
- <vorgang-manager.version>2.13.0</vorgang-manager.version>
- <nachrichten-manager.version>2.9.0</nachrichten-manager.version>
- <api-lib.version>0.11.0</api-lib.version>
+ <vorgang-manager.version>2.15.0-PR-458-SNAPSHOT</vorgang-manager.version>
+ <nachrichten-manager.version>2.12.0-PR-31-SNAPSHOT</nachrichten-manager.version>
+ <api-lib.version>0.13.0-PR-31-SNAPSHOT</api-lib.version>
</properties>
<dependencies>
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
index 8abe425a3a1187b737bb41c851c1578a8db3e12c..88eb2f52f36e89c4e8ea4f75db9739b1632ef64c 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
@@ -31,6 +31,8 @@ import de.ozgcloud.common.binaryfile.FileId;
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) //
public interface BescheidMapper {
+ @Mapping(target = "sentInfoOrBuilder", ignore = true)
+ @Mapping(target = "defaultInstanceForType", ignore = true)
@Mapping(target = "mergeFrom", ignore = true)
@Mapping(target = "clearField", ignore = true)
@Mapping(target = "clearOneof", ignore = true)
@@ -117,6 +119,8 @@ public interface BescheidMapper {
.build();
}
+ @Mapping(target = "featuresOrBuilder", ignore = true)
+ @Mapping(target = "defaultInstanceForType", ignore = true)
@Mapping(target = "mergeFrom", ignore = true)
@Mapping(target = "clearField", ignore = true)
@Mapping(target = "clearOneof", ignore = true)
@@ -128,6 +132,8 @@ public interface BescheidMapper {
@Mapping(target = "allFields", ignore = true)
GrpcBescheidManagerConfigResponse fromBescheidManagerConfig(BescheidManagerConfig bescheidManagerConfig);
+ @Mapping(target = "defaultInstanceForType", ignore = true)
+ @Mapping(target = "bescheidOrBuilder", ignore = true)
@Mapping(target = "mergeFrom", ignore = true)
@Mapping(target = "clearField", ignore = true)
@Mapping(target = "clearOneof", ignore = true)
@@ -137,6 +143,8 @@ public interface BescheidMapper {
@Mapping(target = "allFields", ignore = true)
GrpcGetBescheidResponse toGetBescheidResponse(Bescheid bescheid);
+ @Mapping(target = "defaultInstanceForType", ignore = true)
+ @Mapping(target = "bescheidOrBuilder", ignore = true)
@Mapping(target = "mergeFrom", ignore = true)
@Mapping(target = "clearField", ignore = true)
@Mapping(target = "clearOneof", ignore = true)
diff --git a/vorgang-manager-command/pom.xml b/vorgang-manager-command/pom.xml
index 0356ef538d644aa231f87c7a724eff3cadde1f3e..0670d29553700fb24ce6a93d4e4e65eb400a8a8a 100644
--- a/vorgang-manager-command/pom.xml
+++ b/vorgang-manager-command/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.4.0-PR-25-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/vorgang-manager-interface/pom.xml b/vorgang-manager-interface/pom.xml
index 0b948feae93c4320349346096c513ca9e52ad1e2..9201638972a10b73161cb15fc1e9b956d2f1f19b 100644
--- a/vorgang-manager-interface/pom.xml
+++ b/vorgang-manager-interface/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.4.0-PR-25-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -110,7 +110,7 @@
</outputTarget>
<outputTarget>
<type>grpc-java</type>
- <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.66.0</pluginArtifact>
+ <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen.version}</pluginArtifact>
</outputTarget>
</outputTargets>
</configuration>
diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index 8b6c2be09f80fcc33790519375ec892be0badd42..6ee6dced07cf16fce31f8b426130855b1e7fad0b 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.4.0-PR-25-SNAPSHOT</version>
<relativePath />
</parent>
@@ -50,15 +50,15 @@
<spring-boot.build-image.imageName>docker.ozg-sh.de/vorgang-manager:build-latest</spring-boot.build-image.imageName>
<ozgcloud.license.version>1.3.0</ozgcloud.license.version>
- <zufi-manager-interface.version>1.0.0</zufi-manager-interface.version>
+ <zufi-manager-interface.version>1.4.0-PR-86-SNAPSHOT</zufi-manager-interface.version>
- <user-manager-interface.version>2.1.0</user-manager-interface.version>
+ <user-manager-interface.version>2.9.0-PR-128-SNAPSHOT</user-manager-interface.version>
<bescheid-manager.version>1.18.0-SNAPSHOT</bescheid-manager.version>
- <processor-manager.version>0.4.1</processor-manager.version>
- <nachrichten-manager.version>2.12.0-SNAPSHOT</nachrichten-manager.version>
- <ozgcloud-starter.version>0.10.0</ozgcloud-starter.version>
- <notification-manager.version>2.11.0-SNAPSHOT</notification-manager.version>
- <collaboration-manager.version>0.3.0-SNAPSHOT</collaboration-manager.version>
+ <processor-manager.version>0.5.0-PR-14-SNAPSHOT</processor-manager.version>
+ <nachrichten-manager.version>2.12.0-PR-31-SNAPSHOT</nachrichten-manager.version>
+ <ozgcloud-starter.version>0.13.0-PR-31-SNAPSHOT</ozgcloud-starter.version>
+ <notification-manager.version>2.11.0-PR-7-SNAPSHOT</notification-manager.version>
+ <collaboration-manager.version>0.3.0-PR-6-SNAPSHOT</collaboration-manager.version>
<zip.version>2.11.1</zip.version>
<jsoup.version>1.15.3</jsoup.version>
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java
index bc436dedd25d7bd9ee4ef1ad95f7cfffb1612e8b..9dd16768fa2e3cfc2af597994881b793122fe97e 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java
@@ -5,8 +5,8 @@ import java.util.List;
import org.springframework.stereotype.Service;
import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
-import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationRequest;
-import de.ozgcloud.zufi.grpc.registration.VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub;
+import de.ozgcloud.zufi.grpc.organisationseinheit.GrpcVorgangManagerRegistrationRequest;
+import de.ozgcloud.zufi.grpc.organisationseinheit.VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
import net.devh.boot.grpc.client.inject.GrpcClient;
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangWithEingangMapper.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangWithEingangMapper.java
index a69a46cd567558faad48a5e3a4de33101acfaea6..d75ab5873cd6342996cdc7fe98c57032362ac079 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangWithEingangMapper.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangWithEingangMapper.java
@@ -50,8 +50,30 @@ public abstract class VorgangWithEingangMapper {
.build();
}
- @Mapping(target = "eingang", source = "eingangs")
+ @Mapping(target = "unknownFields", ignore = true)
+ @Mapping(target = "statusBytes", ignore = true)
+ @Mapping(target = "removeClientAttributes", ignore = true)
+ @Mapping(target = "nummerBytes", ignore = true)
+ @Mapping(target = "nameBytes", ignore = true)
+ @Mapping(target = "mergeUnknownFields", ignore = true)
+ @Mapping(target = "mergeHeader", ignore = true)
+ @Mapping(target = "mergeFrom", ignore = true)
+ @Mapping(target = "mergeEingang", ignore = true)
+ @Mapping(target = "idBytes", ignore = true)
+ @Mapping(target = "headerOrBuilder", ignore = true)
+ @Mapping(target = "formEngineNameBytes", ignore = true)
+ @Mapping(target = "eingangOrBuilder", ignore = true)
+ @Mapping(target = "defaultInstanceForType", ignore = true)
+ @Mapping(target = "createdAtBytes", ignore = true)
+ @Mapping(target = "clientAttributesOrBuilderList", ignore = true)
+ @Mapping(target = "clientAttributesList", ignore = true)
+ @Mapping(target = "clearOneof", ignore = true)
+ @Mapping(target = "clearField", ignore = true)
+ @Mapping(target = "assignedToBytes", ignore = true)
+ @Mapping(target = "allFields", ignore = true)
+ @Mapping(target = "aktenzeichenBytes", ignore = true)
@Mapping(target = "clientAttributesBuilderList", ignore = true)
+ @Mapping(target = "eingang", source = "eingangs")
abstract GrpcVorgangWithEingang toGrpcWithoutClientAttributes(Vorgang vorgang);
Eingang mapListToGrpcEingang(List<Eingang> eingaenge) {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java
index 7bf1b282a7708c1e16fab1f6f6a71873b5f245bf..831f430ef392061414267c8478689cbe90f1a712 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.vorgang.registry;
-import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationResponse;
+import de.ozgcloud.zufi.grpc.organisationseinheit.GrpcVorgangManagerRegistrationResponse;
public class GrpcRegistrationResponseTestFactory {
public static GrpcVorgangManagerRegistrationResponse create() {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java
index 384ca37218780385c58092d40024998380a4e4c2..a09030f20ec00b66f0edb7d1823874c5a0f41101 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java
@@ -14,8 +14,8 @@ import org.mockito.Mock;
import org.mockito.Spy;
import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
-import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationRequest;
-import de.ozgcloud.zufi.grpc.registration.VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub;
+import de.ozgcloud.zufi.grpc.organisationseinheit.GrpcVorgangManagerRegistrationRequest;
+import de.ozgcloud.zufi.grpc.organisationseinheit.VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub;
class ZufiRemoteServiceTest {
private static final String ORGANISATIONS_EINHEITEN_ID = "123456";
diff --git a/vorgang-manager-utils/pom.xml b/vorgang-manager-utils/pom.xml
index a0912e28bda3314f97611f93811967153642e1b3..454cfe299a95656f9364dfe4b6737245132fa0f8 100644
--- a/vorgang-manager-utils/pom.xml
+++ b/vorgang-manager-utils/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.4.0-PR-25-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -45,7 +45,7 @@
<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.28</lombok.version>
+ <lombok.version>1.18.34</lombok.version>
</properties>