X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=30cd824453d18dd46da2ce329afb953d821223d9;hb=96b4eae15f6e43154d47b1fc2442f1345f405c0b;hp=e47c8c0943b8261781d09e8bcf8bbdf319d56a03;hpb=88c4aeab197aec7c4b2bba0f3595cc32a718d8cb;p=dmaap%2Fkafka11aaf.git diff --git a/pom.xml b/pom.xml index e47c8c0..30cd824 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + + + ${basedir}/target/docker-stage + ${basedir}/src/main/docker + + + ${basedir}/src/main/resources + + + + org.apache.maven.plugins @@ -109,17 +121,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - false - - - injected-nexus-deploy - none - - - maven-deploy-plugin 2.8 @@ -152,7 +153,7 @@ org.onap.dmaap.messagerouter.mirroragent dmaapMMAgent - 1.1.1-SNAPSHOT + 1.1.2 dmaapMMAgent.jar @@ -161,120 +162,30 @@ - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-no-snapshots - - enforce - - - - - No Snapshots Allowed! - - org.onap.dmaap.messagerouter.mirroragent:dmaapMMAgent - - - - true - - - + maven-resources-plugin + 2.7 + + + copy-jar + install + + copy-resources + + + ${basedir}/target/docker-stage + + + ${basedir}/target + + dmaapMMAgent.jar + kafka11aaf-jar-with-dependencies.jar + + + + + + - - com.spotify - docker-maven-plugin - 1.0.0 - - onap/dmaap/kafka01101 - src/main/docker - docker-hub - - ${KafkaImg} - latest - - true - - - - / - ${project.build.directory} - **/** - - - / - ${project.build.directory} - dmaapMMAgent.jar - - - - - - build-image - install - - build - - - ${skip.docker.build} - - - - - tag-image-project-version - install - - tag - - - onap/dmaap/kafka01101 - ${docker.push.registry}/onap/dmaap/kafka01101:${KafkaImg} - ${skip.docker.push} - - - - - tag-image-latest - install - - tag - - - onap/dmaap/kafka01101 - ${docker.push.registry}/onap/dmaap/kafka01101:latest - ${skip.docker.push} - - - - - push-image - deploy - - push - - - ${docker.push.registry}/onap/dmaap/kafka01101:${KafkaImg} - ${skip.docker.push} - - - - - push-image-latest - deploy - - push - - - ${docker.push.registry}/onap/dmaap/kafka01101:latest - ${skip.docker.push} - - - - - org.apache.maven.plugins maven-assembly-plugin @@ -304,7 +215,8 @@ UTF-8 - 0.0.3 + ${maven.build.timestamp} + yyyyMMdd'T'HHmmss'Z' /content/sites/site/org/onap/dmaap/kafka0111/${project.artifactId}/${project.version} true true @@ -341,8 +253,10 @@ org.apache.kafka kafka_2.11 - 0.11.0.3 + 2.3.0 + provided + org.powermock powermock-api-mockito @@ -379,6 +293,86 @@ false false + + + + org.codehaus.groovy.maven + gmaven-plugin + + + validate + + execute + + + + ${project.version} + ${maven.build.timestamp} + + + println project.properties['ver']; + if ( project.properties['ver'].endsWith("-SNAPSHOT") ) { + project.properties['dockertag1']=project.properties['ver'] + + "-latest"; + project.properties['dockertag2']=project.properties['ver'] + + "-" + project.properties['timestamp']; + } else { + project.properties['dockertag1']=project.properties['ver'] + + "-STAGING-latest"; + project.properties['dockertag2']=project.properties['ver'] + + "-STAGING-" + project.properties['timestamp']; + } + println 'docker tag 1: ' + project.properties['dockertag1']; + println 'docker tag 2: ' + project.properties['dockertag2']; + + + + + + + + io.fabric8 + docker-maven-plugin + 0.28.0 + + ${docker.verbose} + ${docker.apiVersion} + ${docker.pull.registry} + ${docker.push.registry} + + + onap/dmaap/kafka111 + + try + ${basedir}/target/docker-stage + Dockerfile + + ${dockertag1} + ${dockertag2} + + + + + + + + generate-images + install + + build + + + + push-images + deploy + + push + + + + + +