From 91c9aa0969a56d57435497ab67203db28ec8cdba Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 23 Sep 2024 13:05:58 +0200
Subject: [PATCH] OZG-6710 update common-lib
---
...pringframework.boot.autoconfigure.AutoConfiguration.imports | 2 --
.../bayernid/proxy/BayernIdProxyGrpcServiceITCase.java | 2 --
bayernid-proxy-interface/pom.xml | 3 ++-
pom.xml | 2 +-
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/bayernid-proxy-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bayernid-proxy-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 31f436d..273a489 100644
--- a/bayernid-proxy-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/bayernid-proxy-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,5 +1,4 @@
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
@@ -11,4 +10,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
diff --git a/bayernid-proxy-impl/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/proxy/BayernIdProxyGrpcServiceITCase.java b/bayernid-proxy-impl/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/proxy/BayernIdProxyGrpcServiceITCase.java
index 8f9468c..f1ce665 100644
--- a/bayernid-proxy-impl/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/proxy/BayernIdProxyGrpcServiceITCase.java
+++ b/bayernid-proxy-impl/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/proxy/BayernIdProxyGrpcServiceITCase.java
@@ -54,7 +54,6 @@ import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration;
-import net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration;
import net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration;
import net.devh.boot.grpc.client.inject.GrpcClient;
@@ -162,7 +161,6 @@ class BayernIdProxyGrpcServiceITCase {
GrpcClientHealthAutoConfiguration.class,
GrpcClientMetricAutoConfiguration.class,
GrpcClientSecurityAutoConfiguration.class,
- GrpcClientTraceAutoConfiguration.class,
GrpcDiscoveryClientAutoConfiguration.class
})
static class TestConfig {
diff --git a/bayernid-proxy-interface/pom.xml b/bayernid-proxy-interface/pom.xml
index 47af897..6d3d697 100644
--- a/bayernid-proxy-interface/pom.xml
+++ b/bayernid-proxy-interface/pom.xml
@@ -30,7 +30,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>
@@ -80,6 +80,7 @@
<goal>run</goal>
</goals>
<configuration>
+ <protocVersion>${protobuf.version}</protocVersion>
<includeMavenTypes>direct</includeMavenTypes>
<outputTargets>
<outputTarget>
diff --git a/pom.xml b/pom.xml
index a6dd530..f395eff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,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>
--
GitLab