From e4385bc86aac60d3b35bc90ad248cf61d9545468 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 24 Sep 2024 09:14:23 +0200
Subject: [PATCH] OZG-6710 update common-lib
---
info-manager-interface/pom.xml | 5 +++--
info-manager-server/pom.xml | 7 ++-----
.../src/test/java/de/ozgcloud/info/GrpcTestConfig.java | 2 --
.../info/infomanager/InformationGrpcTestConfiguration.java | 2 --
4 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/info-manager-interface/pom.xml b/info-manager-interface/pom.xml
index 775547d..08b9ce0 100644
--- a/info-manager-interface/pom.xml
+++ b/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.4.0-PR-25-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>
diff --git a/info-manager-server/pom.xml b/info-manager-server/pom.xml
index 0794db3..ed981c7 100644
--- a/info-manager-server/pom.xml
+++ b/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.4.0-PR-25-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -52,10 +52,9 @@
<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.3.0-SNAPSHOT</info-manager-interface.version>
</properties>
<dependencies>
@@ -68,13 +67,11 @@
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-client-spring-boot-starter</artifactId>
- <version>${net-devh-grpc.version}</version>
</dependency>
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
- <version>${net-devh-grpc.version}</version>
</dependency>
<!-- Spring -->
diff --git a/info-manager-server/src/test/java/de/ozgcloud/info/GrpcTestConfig.java b/info-manager-server/src/test/java/de/ozgcloud/info/GrpcTestConfig.java
index 28e0486..cf12948 100644
--- a/info-manager-server/src/test/java/de/ozgcloud/info/GrpcTestConfig.java
+++ b/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,
diff --git a/info-manager-server/src/test/java/de/ozgcloud/info/infomanager/InformationGrpcTestConfiguration.java b/info-manager-server/src/test/java/de/ozgcloud/info/infomanager/InformationGrpcTestConfiguration.java
index 8c04d96..78ce24d 100644
--- a/info-manager-server/src/test/java/de/ozgcloud/info/infomanager/InformationGrpcTestConfiguration.java
+++ b/info-manager-server/src/test/java/de/ozgcloud/info/infomanager/InformationGrpcTestConfiguration.java
@@ -36,7 +36,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;
@@ -45,7 +44,6 @@ import net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfigurati
@Configuration
@ImportAutoConfiguration({
GrpcCommonCodecAutoConfiguration.class,
- GrpcCommonTraceAutoConfiguration.class,
GrpcServerAutoConfiguration.class,
GrpcServerFactoryAutoConfiguration.class,
GrpcServerSecurityAutoConfiguration.class,
--
GitLab