X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=30cd824453d18dd46da2ce329afb953d821223d9;hb=96b4eae15f6e43154d47b1fc2442f1345f405c0b;hp=3c0a3d4ac7dd7a5718c1b72477f7df2ebbc29987;hpb=bbaea416e64d2a4920c7377ec0a91b8ab36ded2b;p=dmaap%2Fkafka11aaf.git
diff --git a/pom.xml b/pom.xml
index 3c0a3d4..30cd824 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
org.onap.oparent
oparent
- 2.0.0
+ 2.1.0
org.onap.dmaap.kafka
@@ -39,6 +39,18 @@
+
+
+
+ ${basedir}/target/docker-stage
+ ${basedir}/src/main/docker
+
+
+ ${basedir}/src/main/resources
+
+
+
+
org.apache.maven.plugins
@@ -150,96 +162,30 @@
- com.spotify
- docker-maven-plugin
- 1.0.0
-
- onap/dmaap/kafka111
- src/main/docker
- docker-hub
-
- ${dockertag1}
- ${dockertag2}
-
-
-
-
- /
- ${project.build.directory}
- **/**
-
-
- /
- ${project.build.directory}
- dmaapMMAgent.jar
-
-
-
-
-
- build-image
- install
-
- build
-
-
- ${skip.docker.build}
-
-
-
-
- tag-image-project-version
- install
-
- tag
-
-
- onap/dmaap/kafka111
- ${docker.push.registry}/onap/dmaap/kafka111:${dockertag2}
- ${skip.docker.push}
-
-
-
-
- tag-image-latest
- install
-
- tag
-
-
- onap/dmaap/kafka111
- ${docker.push.registry}/onap/dmaap/kafka111:${dockertag1}
- ${skip.docker.push}
-
-
-
-
- push-image
- deploy
-
- push
-
-
- ${docker.push.registry}/onap/dmaap/kafka111:${dockertag2}
- ${skip.docker.push}
-
-
-
-
- push-image-latest
- deploy
-
- push
-
-
- ${docker.push.registry}/onap/dmaap/kafka111:${dockertag1}
- ${skip.docker.push}
-
-
-
+ maven-resources-plugin
+ 2.7
+
+
+ copy-jar
+ install
+
+ copy-resources
+
+
+ ${basedir}/target/docker-stage
+
+
+ ${basedir}/target
+
+ dmaapMMAgent.jar
+ kafka11aaf-jar-with-dependencies.jar
+
+
+
+
+
+
-
org.apache.maven.plugins
maven-assembly-plugin
@@ -306,9 +252,11 @@
org.apache.kafka
- kafka_2.12
- 1.1.1
+ kafka_2.11
+ 2.3.0
+ provided
+
org.powermock
powermock-api-mockito
@@ -381,10 +329,52 @@
+
+
+ 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
+
+
+
+
-
\ No newline at end of file
+