diff --git a/info-manager-interface/pom.xml b/info-manager-interface/pom.xml index 775547d7ee812795537ebce201525be1451c9598..08b9ce05e23a0d89d8d448a336d07f5328400891 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 0794db3687061c5c4099a005d3718827eeab68a5..ed981c7ab339a7340d4fad3ac85d65316ae6e06f 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 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/infomanager/InformationGrpcTestConfiguration.java b/info-manager-server/src/test/java/de/ozgcloud/info/infomanager/InformationGrpcTestConfiguration.java index 8c04d9662d2210175869aa8a8b686728cef35aa9..78ce24d319c6d70accdddf176daeab53d4d10904 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,