diff --git a/info-manager-interface/pom.xml b/info-manager-interface/pom.xml index e1aae0b18a73b7ec49a85996b0896efb557b89bd..eb7ec6dcff8c6c2ee7976192ddb1027e21523337 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.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> diff --git a/info-manager-server/pom.xml b/info-manager-server/pom.xml index 49f74579924b7a7a42b4a3a1ae5738275feb8f28..f965cf112ecf0e539ac92d0be8632c7d314b5267 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.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> 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 28e0486a42f954374672de7a5871222451d15f79..cf12948869620c81385340a384878b16558887d7 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/information/InformationGrpcTestConfiguration.java b/info-manager-server/src/test/java/de/ozgcloud/info/information/InformationGrpcTestConfiguration.java index 269cf96411e9763c3894c14c1b6f8537c407ddf8..55f1ce95b945a68b13098d59c6f11f51b3faf596 100644 --- a/info-manager-server/src/test/java/de/ozgcloud/info/information/InformationGrpcTestConfiguration.java +++ b/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,