diff --git a/Jenkinsfile b/Jenkinsfile index ceae955dce318ec49930a58d4e8a8ead4c9e234a..5e8796769fde886b7f28923016e72948e43ec91e 100644 --- a/Jenkinsfile +++ b/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()}" diff --git a/pom.xml b/pom.xml index 6ebcd05dc7c582d5b3ff3f7a264691a421ee46ee..ee8c31f35292b3a5727a39ed9966a14d10fdbbdd 100644 --- a/pom.xml +++ b/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> diff --git a/zufi-manager-interface/pom.xml b/zufi-manager-interface/pom.xml index 5c3bfec63f9ae09cc405c12e6586dad1baa2961b..5a4d2988ef19b40223571d61135af5367d2f16f5 100644 --- a/zufi-manager-interface/pom.xml +++ b/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> diff --git a/zufi-manager-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zufi-manager-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index cf691e550bfba4adeed4126ab764030e268a9879..fa21b2b3140edc55ce7737c92df8c60e282d6456 100644 --- a/zufi-manager-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/zufi-manager-server/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 @@ -10,5 +9,4 @@ net.devh.boot.grpc.server.autoconfigure.GrpcReflectionServiceAutoConfiguration 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 \ No newline at end of file +net.devh.boot.grpc.server.autoconfigure.GrpcServerSecurityAutoConfiguration \ No newline at end of file