Merge pull request 'OZG-6710 Update common-lib' (#36) from OZG-6710-Update-common-lib into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/info-manager/pulls/36


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

info-manager-interface/pom.xml

@@ -25,7 +25,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>
 
@@ -98,13 +98,14 @@
 							<goal>run</goal>
 						</goals>
 						<configuration>
+							<protocVersion>${protobuf.version}</protocVersion>
 							<outputTargets>
 								<outputTarget>
 									<type>java</type>
 								</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>

info-manager-server/pom.xml

@@ -26,7 +26,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.3.1</version>
+		<version>4.5.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
@@ -52,10 +52,8 @@
 		<docker-java.version>3.3.3</docker-java.version>
 
 		<grpc-test.version>1.19.0</grpc-test.version>
-		<net-devh-grpc.version>2.15.0.RELEASE</net-devh-grpc.version>
-		<grpc.version>1.57.2</grpc.version>
 		<modulith.version>1.2.2</modulith.version>
-		<info-manager-interface.version>1.2.0</info-manager-interface.version>
+		<info-manager-interface.version>1.4.0-SNAPSHOT</info-manager-interface.version>
 	</properties>
 
 	<dependencies>
@@ -68,7 +66,6 @@
 		<dependency>
 			<groupId>net.devh</groupId>
 			<artifactId>grpc-server-spring-boot-starter</artifactId>
-			<version>${net-devh-grpc.version}</version>
 		</dependency>
 
 		<!-- Spring -->
@@ -153,7 +150,6 @@
 		<dependency>
 			<groupId>net.devh</groupId>
 			<artifactId>grpc-client-spring-boot-starter</artifactId>
-			<version>${net-devh-grpc.version}</version>
 			<scope>test</scope>
 		</dependency>
 

info-manager-server/src/test/java/de/ozgcloud/info/GrpcTestConfig.java

@@ -32,12 +32,10 @@ import net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfigurati
 import net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration;
 import net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration;
 import net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration;
-import net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration;
 
 @Configuration
 @ImportAutoConfiguration({
   GrpcCommonCodecAutoConfiguration.class,
-  GrpcCommonTraceAutoConfiguration.class,
 
   GrpcClientAutoConfiguration.class,
   GrpcClientHealthAutoConfiguration.class,

info-manager-server/src/test/java/de/ozgcloud/info/information/InformationGrpcTestConfiguration.java

@@ -34,7 +34,6 @@ import lombok.extern.log4j.Log4j2;
 import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
 import net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration;
 import net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration;
-import net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration;
 import net.devh.boot.grpc.server.autoconfigure.GrpcServerAutoConfiguration;
 import net.devh.boot.grpc.server.autoconfigure.GrpcServerFactoryAutoConfiguration;
 import net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfiguration;
@@ -43,7 +42,6 @@ import net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfigurati
 @Configuration
 @ImportAutoConfiguration({
   GrpcCommonCodecAutoConfiguration.class,
-  GrpcCommonTraceAutoConfiguration.class,
   GrpcServerAutoConfiguration.class,
   GrpcServerFactoryAutoConfiguration.class,
   GrpcServerSecurityAutoConfiguration.class,