diff --git a/Jenkinsfile b/Jenkinsfile index 687eec31616be291cf1af99eea89b24a228e0cb6..519a8b7318e2e5a3abd98cbd41dd8c165612b7b5 100644 --- a/Jenkinsfile +++ b/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" } } } diff --git a/bayernid-proxy-impl/pom.xml b/bayernid-proxy-impl/pom.xml index 3627aa3447bfa2beca0884c94331e1885d0cf5a5..2f0c4a6db17c17717691a45f8598b9f3ac0abea2 100644 --- a/bayernid-proxy-impl/pom.xml +++ b/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> @@ -57,8 +57,8 @@ <artifactId>spring-boot-starter</artifactId> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -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> 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 31f436d781244c879e37eb6d97662f3c5102e6b7..273a489d81630304017e808a7a861fa6b33405c0 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 8f9468c817590b7f34f0c83318084569ae09eaf6..f1ce66516d462b1ba6e63f17345dac1da3a85f85 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 47af8977f592362c556bf4b8ea837311c78e9b0f..bbdaf180b6520d41a163138c882c0dae58330cd7 100644 --- a/bayernid-proxy-interface/pom.xml +++ b/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> diff --git a/pom.xml b/pom.xml index a6dd5300bcfbe9aebceeb3e7b7129db9e604ed82..88cb5b3c2d1880325d01db68a8a8456815f71146 100644 --- a/pom.xml +++ b/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>