Merge branch 'main' into OZG-6716

Jenkinsfile

@@ -83,7 +83,6 @@ pipeline {
                 }
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                     sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
-                    sh "mvn -s $MAVEN_SETTINGS versions:revert"
                 }
                
             }       
@@ -99,6 +98,7 @@ pipeline {
                     dir('bayernid-proxy-impl') {
                         sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3'
                     }
+                    sh "mvn -s $MAVEN_SETTINGS versions:revert"
                 }
            }
         }

bayernid-proxy-impl/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.nachrichten</groupId>
 		<artifactId>nachrichten-bayernid-proxy</artifactId>
-		<version>0.7.0-SNAPSHOT</version>
+		<version>0.8.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
@@ -96,7 +96,10 @@
 			<groupId>io.grpc</groupId>
 			<artifactId>grpc-inprocess</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>io.grpc</groupId>
+			<artifactId>grpc-census</artifactId>
+		</dependency>
 		<!-- aspectJ -->
 		<dependency>
 			<groupId>org.aspectj</groupId>

bayernid-proxy-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

 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

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 {

bayernid-proxy-interface/pom.xml

@@ -30,13 +30,13 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.3.1</version>
+		<version>4.5.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>de.ozgcloud.nachrichten</groupId>
 	<artifactId>bayernid-proxy-interface</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
+	<version>0.8.0-SNAPSHOT</version>
 
 	<name>OZG-Cloud BayernID Proxy Interface</name>
 	<description>Interface (gRPC) for BayernID Proxy Service</description>
@@ -80,6 +80,7 @@
 							<goal>run</goal>
 						</goals>
 						<configuration>
+							<protocVersion>${protobuf.version}</protocVersion>
 							<includeMavenTypes>direct</includeMavenTypes>
 							<outputTargets>
 								<outputTarget>

pom.xml

@@ -31,13 +31,13 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.3.1</version>
+		<version>4.5.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>de.ozgcloud.nachrichten</groupId>
 	<artifactId>nachrichten-bayernid-proxy</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
+	<version>0.8.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>OZG-Cloud BayernID Proxy</name>