Merge branch 'master' into OZG-6798-Validierung-Mail-Request

nachrichten-manager-interface/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.3.1</version>
+		<version>4.5.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
@@ -50,7 +50,7 @@
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 
-		<vorgang-manager.version>2.7.0</vorgang-manager.version>
+		<vorgang-manager.version>2.17.0-SNAPSHOT</vorgang-manager.version>
 		<find-and-replace-maven-plugin.version>1.1.0</find-and-replace-maven-plugin.version>
 		<ozgcloud.license.version>1.6.0</ozgcloud.license.version>
 	</properties>
@@ -102,6 +102,7 @@
 							<goal>run</goal>
 						</goals>
 						<configuration>
+							<protocVersion>${protobuf.version}</protocVersion>
 							<includeMavenTypes>direct</includeMavenTypes>
 							<outputTargets>
 								<outputTarget>
@@ -109,7 +110,7 @@
 								</outputTarget>
 								<outputTarget>
 									<type>grpc-java</type>
-									<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.58.0</pluginArtifact>
+									<pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen.version}</pluginArtifact>
 								</outputTarget>
 							</outputTargets>
 						</configuration>

nachrichten-manager-server/pom.xml

@@ -44,8 +44,8 @@
 		<shedlock.version>4.25.0</shedlock.version>
 		<logcaptor.version>2.7.10</logcaptor.version>
 		<jaxb-maven-plugin.version>3.0.1</jaxb-maven-plugin.version>
-		<ozg-info-manager-interface.version>1.2.0</ozg-info-manager-interface.version>
-		<bayernid-proxy-interface.version>0.1.0</bayernid-proxy-interface.version>
+		<ozg-info-manager-interface.version>1.4.0-SNAPSHOT</ozg-info-manager-interface.version>
+		<bayernid-proxy-interface.version>0.7.0</bayernid-proxy-interface.version>
 		<vorgang-manager.version>2.17.0-SNAPSHOT</vorgang-manager.version>
 		<muk-postfach.version>0.1.0-SNAPSHOT</muk-postfach.version>
 		<ozgcloud-starter.version>0.13.0-SNAPSHOT</ozgcloud-starter.version>

nachrichten-manager-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -2,10 +2,8 @@ net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration
-net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration
 net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration
 net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration
-net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration
 net.devh.boot.grpc.server.autoconfigure.GrpcAdviceAutoConfiguration
 net.devh.boot.grpc.server.autoconfigure.GrpcHealthServiceAutoConfiguration
 net.devh.boot.grpc.server.autoconfigure.GrpcMetadataConsulConfiguration
@@ -17,4 +15,3 @@ net.devh.boot.grpc.server.autoconfigure.GrpcServerAutoConfiguration
 net.devh.boot.grpc.server.autoconfigure.GrpcServerFactoryAutoConfiguration
 net.devh.boot.grpc.server.autoconfigure.GrpcServerMetricAutoConfiguration
 net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfiguration
-net.devh.boot.grpc.server.autoconfigure.GrpcServerTraceAutoConfiguration

pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.3.1</version>
+		<version>4.5.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>de.ozgcloud.nachrichten</groupId>