From: Fiete Ostkamp Date: Mon, 2 Jun 2025 11:37:57 +0000 (+0200) Subject: Fix schema-service docker build X-Git-Tag: 1.12.11~4 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F63%2F141063%2F3;p=aai%2Fschema-service.git Fix schema-service docker build - replace gmaven plugin with build-helper-maven-plugin to retrieve major and minor project version during docker build Issue-ID: AAI-4167 Change-Id: If31ea8f5d57fcf3744a364f6e369f59311c2d332 Signed-off-by: Fiete Ostkamp --- diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml index 7bc89dd..cc7704e 100644 --- a/aai-schema-service/pom.xml +++ b/aai-schema-service/pom.xml @@ -77,7 +77,6 @@ /aai/schema-service - @@ -86,8 +85,19 @@ - org.codehaus.groovy.maven - gmaven-plugin + + org.codehaus.mojo + build-helper-maven-plugin + + + parse-version + pre-clean + + parse-version + + + io.fabric8 @@ -103,8 +113,12 @@ @ latest - ${project.docker.latesttag.version} - ${project.major.version}.${project.minor.version}-STAGING-${maven.build.timestamp} + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp} + try ${project.basedir}/src/main/docker @@ -429,31 +443,9 @@ - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - validate - - execute - - - - println project.properties['aai.project.version']; - def versionArray; - if (project.properties['aai.project.version'] != null) { - versionArray = project.properties['aai.project.version'].split('\\.'); - } - - project.properties["project.major.version"] = versionArray[0]; - project.properties["project.minor.version"] = versionArray[1]; - project.properties['project.docker.latesttag.version'] = versionArray[0] + '.' + versionArray[1] + '-STAGING-latest'; - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - - - - + org.codehaus.mojo + build-helper-maven-plugin + 3.6.0 @@ -474,10 +466,6 @@ - - org.codehaus.groovy.maven - gmaven-plugin - org.apache.maven.plugins maven-dependency-plugin