Merge pull request 'OZG-6710 Update common-lib' (#86) from OZG-6710-update-common-lib into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/zufi-manager/pulls/86


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

Jenkinsfile

@@ -33,7 +33,7 @@ pipeline {
                     def rootVersion = getRootPomVersion()
                     def zufiManagerServerVersion = getParentPomVersion('zufi-manager-server/pom.xml')
                     def zufiManagerPvogVersion = getParentPomVersion('zufi-manager-pvog/pom.xml')
-                    def zufiManagerInterfaceVersion = getParentPomVersion('zufi-manager-interface/pom.xml')
+                    def zufiManagerInterfaceVersion = getPomVersion('zufi-manager-interface/pom.xml')
                     def zufiManagerModelVersion = getParentPomVersion('zufi-manager-model/pom.xml')
 
                     if (isReleaseBranch()) {
@@ -436,8 +436,7 @@ Void performSonarCheck(String module) {
 }
 
 String getRootPomVersion() {
-    def rootPom = readMavenPom file: 'pom.xml'
-    return rootPom.version
+    return getPomVersion('pom.xml')
 }
 
 String getParentPomVersion(String filePath) {
@@ -445,6 +444,11 @@ String getParentPomVersion(String filePath) {
     return pom.parent.version
 }
 
+String getPomVersion(String pomFile){
+    def pom = readMavenPom file: pomFile
+    return pom.version
+}
+
 String generateImageTag() {
     def imageTag = "${env.BRANCH_NAME}-${getRootPomVersion()}"
 

pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.3.2</version>
+		<version>4.5.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -52,9 +52,6 @@
 		<jaxb-impl.version>4.0.5</jaxb-impl.version>
 		<mojo-jaxb2-plugin.version>3.2.0</mojo-jaxb2-plugin.version>
 
-		<find-and-replace-maven-plugin.version>1.2.0</find-and-replace-maven-plugin.version>
-		<protoc-jar-plugin.version>3.11.4</protoc-jar-plugin.version>
-
 		<jakarta.activation.api.version>2.1.3</jakarta.activation.api.version>
 
 		<wiremock-standalone.version>3.8.0</wiremock-standalone.version>

zufi-manager-interface/pom.xml

@@ -28,15 +28,23 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>de.ozgcloud.zufi</groupId>
-		<artifactId>zufi-manager</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<groupId>de.ozgcloud.common</groupId>
+		<artifactId>ozgcloud-common-dependencies</artifactId>
+		<version>4.5.0-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 
+	<groupId>de.ozgcloud.zufi</groupId>
 	<artifactId>zufi-manager-interface</artifactId>
+	<version>1.4.0-SNAPSHOT</version>
+
 	<name>OZG-Cloud Zufi Manager Interface</name>
 	<description>gRPC Api for Zufi Manager</description>
 
+	<properties>
+		<find-and-replace-maven-plugin.version>1.2.0</find-and-replace-maven-plugin.version>
+	</properties>
+
 	<dependencies>
 		<!-- GRPC -->
 		<dependency>
@@ -76,13 +84,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>

zufi-manager-server/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
\ No newline at end of file
-net.devh.boot.grpc.server.autoconfigure.GrpcServerTraceAutoConfiguration
\ No newline at end of file