X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=067fbbc0f220bc2c92feec220ff22a1420ff381a;hb=8a503123a284a9d5183a5941603a6ad88d80869d;hp=7e2d933ce16d9d38330cf229d705e59819f2b239;hpb=ccebf7fa3f3f6bb415f092ced8490758c70b08dc;p=dmaap%2Fkafka11aaf.git
diff --git a/pom.xml b/pom.xml
index 7e2d933..067fbbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
-
-
- ${basedir}/target/docker-stage
- ${basedir}/src/main/docker
-
- *
-
-
-
+
+
+
+ ${basedir}/target/docker-stage
+ ${basedir}/src/main/docker
+
+ *
+
+
+
org.apache.maven.plugins
@@ -119,17 +119,6 @@
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- false
-
-
- injected-nexus-deploy
- none
-
-
-
maven-deploy-plugin
2.8
@@ -162,7 +151,7 @@
org.onap.dmaap.messagerouter.mirroragent
dmaapMMAgent
- 1.1.1
+ 1.1.2
dmaapMMAgent.jar
@@ -170,32 +159,31 @@
-
-
- maven-resources-plugin
- 2.7
-
-
- copy-jar
- install
-
- copy-resources
-
-
- ${basedir}/target/docker-stage
-
-
- ${basedir}/target
-
- dmaapMMAgent.jar
- kafka11aaf-jar-with-dependencies.jar
-
-
-
-
-
-
-
+
+ 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
@@ -226,7 +214,7 @@
UTF-8
${maven.build.timestamp}
- yyyyMMdd'T'HHmmss'Z'
+ yyyyMMdd'T'HHmmss'Z'
/content/sites/site/org/onap/dmaap/kafka0111/${project.artifactId}/${project.version}
true
true
@@ -262,8 +250,8 @@
org.apache.kafka
- kafka_2.11
- 0.11.0.3
+ kafka_2.12
+ 1.1.1
org.powermock
@@ -302,81 +290,85 @@
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/kafka01101
-
- try
- ${basedir}/target/docker-stage
- Dockerfile
-
- ${dockertag1}
- ${dockertag2}
-
-
-
-
-
-
-
- generate-images
- install
-
- build
-
-
-
- push-images
- deploy
-
- push
-
-
-
-
-
-
+
+
+ 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
+
+
+
+
+
+