X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d-standalone%2Fpom.xml;h=ffc5532d5ac33456e2631e7fbcaecaec48ec177e;hb=a836cf3d744580acd03718c5efbe068c3ecb7e4c;hp=b6b14e1b7fb9160dca02fa4a9d663348ead8f4a0;hpb=9c14e8bc2360c0098a23486ea71fc5c99e2fd64e;p=holmes%2Fengine-management.git diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml index b6b14e1..ffc5532 100644 --- a/engine-d-standalone/pom.xml +++ b/engine-d-standalone/pom.xml @@ -1,7 +1,7 @@ - + - org.openo.holmes.engine-management + org.onap.holmes.engine-management holmes-engine-parent - 1.1.0-SNAPSHOT + 1.3.3-SNAPSHOT holmes-engine-d-standalone @@ -28,8 +30,39 @@ holmes-engine/holmes-engine-d-standalone pom + + ${project.version} + yyyyMMdd'T'HHmmss'Z' + ${maven.build.timestamp} + + + + + org.onap.holmes.engine-management + holmes-engine-d + ${project.version} + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + process-resources + + copy-dependencies + + + + + ${linux64outputdir}/lib + runtime + + maven-resources-plugin @@ -52,28 +85,29 @@ **/*.bat + + ../engine-d/src/main/resources + false + true - copy-resources-${win64id} + copy-dockerfile process-resources copy-resources - ${win64outputdir} + target/version src/main/assembly/ false - **/* + Dockerfile - - **/*.sh - true @@ -83,74 +117,47 @@ org.apache.maven.plugins - maven-dependency-plugin + maven-assembly-plugin - copy-jar-${linux64id} - - copy - - prepare-package + linux64 - - - org.openo.holmes.engine-management - holmes-engine-d - jar - true - ${linux64outputdir} - holmes-engine-d.jar - - + + linux64-assembly.xml + + true + target/version - - - copy-jar-${win64id} + package - copy + attached - prepare-package - - - - org.openo.holmes.engine-management - holmes-engine-d - jar - true - ${win64outputdir} - holmes-engine-d.jar - - - - org.apache.maven.plugins - maven-antrun-plugin + org.codehaus.gmaven + groovy-maven-plugin - distribution - package + validate - run + execute - - - - - - - - - - - - - - - + + println project.properties['holmes.engine.project.version']; + def versionArray; + if (project.properties['holmes.engine.project.version'] != null) { + versionArray = project.properties['holmes.engine.project.version'].split('-'); + } + + project.properties['project.docker.latesttag.version'] = versionArray[0] + "-STAGING-latest"; + project.properties['project.docker.latesttag.version.with.timestamp'] = versionArray[0] + "-STAGING-${build.number}"; + + println 'New Tag for docker:' + + project.properties['project.docker.latesttag.version']; + @@ -158,11 +165,55 @@ - - - org.openo.holmes.engine-management - holmes-engine-d - ${project.version} - - + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.16.5 + false + + + + onap/holmes/engine-management + + try + ${basedir}/target/version/ + ${basedir}/target/version/Dockerfile + + ${project.version} + ${project.version}-${build.number} + ${project.docker.latesttag.version} + ${project.docker.latesttag.version.with.timestamp} + + + + + + + + generate-images + package + + build + + + + + push-images + deploy + + build + push + + + + + + + +