From: ezcoxem Date: Tue, 31 Jul 2018 14:54:56 +0000 (+0100) Subject: Change pom to push new docker image X-Git-Tag: 1.0.1~93 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=commitdiff_plain;h=da23b25192b0f2838e27e93b88e05e07756adbb0 Change pom to push new docker image Issue-ID: DMAAP-12 Change-Id: If621d0318a01855c57324b16f56597f10bc812c8 Signed-off-by: eronkeo --- diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml old mode 100644 new mode 100755 index b4b5a8e3..95b2aa00 --- a/datarouter-node/pom.xml +++ b/datarouter-node/pom.xml @@ -33,23 +33,11 @@ datarouter-node https://github.com/att/DMAAP_DATAROUTER - UTF-8 - 1.8 - 1.8 - ${basedir}/target/ - java false - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.build.directory}/coverage-reports/jacoco-it.exec true - ${project.version} - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + ${basedir}/target/${artifactId} + onap/dmaap/datarouter-node @@ -204,6 +192,16 @@ compile + + + docker + + false + false + false + + + datarouter-node @@ -334,18 +332,88 @@ com.spotify docker-maven-plugin - 0.4.11 + ${docker.maven.plugin.version} - onap/dmaap/datarouter-node + false + ${datarouter.node.image.name} ${docker.location} docker-hub - https://${docker.registry} ${project.version} latest true + + + / + ${docker.location} + ${project.build.finalName}.jar + + + / + ${project.build.directory} + **/** + + + + + build-image + install + + build + + + ${skip.docker.build} + + + + tag-image-project-version + install + + tag + + + ${datarouter.node.image.name} + ${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}:${project.version} + ${skip.docker.push} + + + + tag-image-latest + install + + tag + + + ${datarouter.node.image.name} + ${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}:latest + ${skip.docker.push} + + + + push-image-latest + deploy + + push + + + ${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}:${project.version} + ${skip.docker.push} + + + + push-image + deploy + + push + + + ${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}:latest + ${skip.docker.push} + + + org.apache.maven.plugins @@ -404,6 +472,7 @@ html xml + @@ -412,7 +481,7 @@ 1.6.7 true - ${nexusproxy} + ${onap.nexus.dockerregistry.daily} 176c31dfe190a ecomp-staging @@ -481,22 +550,22 @@ ecomp-releases DR Release Repository - ${nexusproxy}${releaseNexusPath} + ${onap.nexus.url}${releaseNexusPath} ecomp-snapshots DR Snapshot Repository - ${nexusproxy}${snapshotNexusPath} + ${onap.nexus.url}${snapshotNexusPath} ecomp-site - dav:${nexusproxy}${sitePath} + dav:${onap.nexus.url}${sitePath} onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ + ${onap.nexus.url}${snapshotNexusPath} - \ No newline at end of file + diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml old mode 100644 new mode 100755 index 07ddc84a..a348c784 --- a/datarouter-prov/pom.xml +++ b/datarouter-prov/pom.xml @@ -33,24 +33,13 @@ datarouter-prov https://github.com/att/DMAAP_DATAROUTER - UTF-8 - 1.8 - 1.8 - ${basedir}/target/ java false - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.build.directory}/coverage-reports/jacoco-it.exec - true - ${project.version} - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + + ${basedir}/target/${artifactId} + onap/dmaap/datarouter-prov @@ -229,6 +218,18 @@ compile + + + + docker + + false + false + false + + + + datarouter-prov @@ -302,18 +303,88 @@ com.spotify docker-maven-plugin - 0.4.11 + ${docker.maven.plugin.version} - onap/dmaap/datarouter-prov + false + ${datarouter.prov.image.name} ${docker.location} docker-hub - https://${docker.registry} ${project.version} latest true + + + / + ${docker.location} + ${project.build.finalName}.jar + + + / + ${project.build.directory} + **/** + + + + + build-image + install + + build + + + ${skip.docker.build} + + + + tag-image-project-version + install + + tag + + + ${datarouter.prov.image.name} + ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:${project.version} + ${skip.docker.push} + + + + tag-image-latest + install + + tag + + + ${datarouter.prov.image.name} + ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:latest + ${skip.docker.push} + + + + push-image-latest + deploy + + push + + + ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:${project.version} + ${skip.docker.push} + + + + push-image + deploy + + push + + + ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:latest + ${skip.docker.push} + + + maven-resources-plugin @@ -473,6 +544,7 @@ html xml + @@ -481,7 +553,7 @@ 1.6.7 true - ${nexusproxy} + ${onap.nexus.dockerregistry.daily} 176c31dfe190a ecomp-staging @@ -550,22 +622,22 @@ ecomp-releases DR Release Repository - ${nexusproxy}${releaseNexusPath} + ${onap.nexus.url}${releaseNexusPath} ecomp-snapshots DR Snapshot Repository - ${nexusproxy}${snapshotNexusPath} + ${onap.nexus.url}${snapshotNexusPath} ecomp-site - dav:${nexusproxy}${sitePath} + dav:${onap.nexus.url}${sitePath} onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ + ${onap.nexus.url}${snapshotNexusPath} - \ No newline at end of file + diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index e6dd36c9..154e6a19 --- a/pom.xml +++ b/pom.xml @@ -1,164 +1,164 @@ - - - 4.0.0 - org.onap.dmaap.datarouter - parent - dmaap-datarouter - 1.0.1-SNAPSHOT - pom - https://github.com/att/DMAAP_DATAROUTER - - org.onap.oparent - oparent - 0.1.1 - - - UTF-8 - 1.8 - 1.8 - java - false - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.build.directory}/coverage-reports/jacoco-it.exec - true - ${project.version} - https://nexus.onap.org - /content/repositories/snapshots/ - /content/repositories/releases/ - /content/repositories/staging/ - /content/sites/site/org/onap/dmaap/datarouter/${project.artifactId}/${project.version} - - - datarouter-prov - datarouter-node - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - **/gen/** - **/generated-sources/** - **/yang-gen/** - **/pax/** - - - - - pre-unit-test - - prepare-agent - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - surefireArgLine - - - - post-unit-test - test - - report - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - ${project.reporting.outputDirectory}/jacoco-ut - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - ${project.build.directory}/code-coverage/jacoco-it.exec - failsafeArgLine - - - - post-integration-test - post-integration-test - - report - - - ${project.build.directory}/code-coverage/jacoco-it.exec - ${project.reporting.outputDirectory}/jacoco-it - - - - - - - - - ecomp-releases - DR Release Repository - ${nexusproxy}${releaseNexusPath} - - - ecomp-snapshots - DR Snapshot Repository - ${nexusproxy}${snapshotNexusPath} - - - ecomp-site - dav:${nexusproxy}${sitePath} - - - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - \ No newline at end of file + + + 4.0.0 + org.onap.dmaap.datarouter + parent + dmaap-datarouter + 1.0.1-SNAPSHOT + pom + https://github.com/att/DMAAP_DATAROUTER + + org.onap.oparent + oparent + 1.1.0 + + + UTF-8 + 1.8 + 1.8 + java + false + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/dmaap/datarouter/${project.artifactId}/${project.version} + 1.0.0 + true + true + true + + + datarouter-prov + datarouter-node + + + + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${onap.nexus.url} + 176c31dfe190a + ecomp-staging + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + surefireArgLine + + + + post-unit-test + test + + report + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/code-coverage/jacoco-it.exec + failsafeArgLine + + + + post-integration-test + post-integration-test + + report + + + ${project.build.directory}/code-coverage/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + + + + + + + + ecomp-releases + DR Release Repository + ${onap.nexus.url}${releaseNexusPath} + + + ecomp-snapshots + DR Snapshot Repository + ${onap.nexus.url}${snapshotNexusPath} + + + ecomp-site + dav:${onap.nexus.url}${sitePath} + + + + + onap-plugin-snapshots + ${onap.nexus.url}${snapshotNexusPath} + + +