X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-subscriber%2Fpom.xml;h=96d55b71d2c3059be28848d5bff46361759a5d57;hb=7704d3079906a4fb51cd58f12d56bd3100fca6b2;hp=3e2bab578898b5081024c23a507e40287faf18de;hpb=549770ee16f6522b2f25ed8fed95a097c1b71271;p=dmaap%2Fdatarouter.git
diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index 3e2bab57..96d55b71 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -26,7 +26,7 @@
org.onap.dmaap.datarouter
parent
- 1.0.5-SNAPSHOT
+ 2.1.0-SNAPSHOT
../pom.xml
datarouter-subscriber
@@ -40,6 +40,9 @@
${basedir}/target/${artifactId}
onap/dmaap/datarouter-subscriber
+
+ ${maven.build.timestamp}
+ yyyyMMdd'T'HHmmss'Z'
@@ -163,40 +166,78 @@
+
+
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+
+ ${project.version}
+ ${maven.build.timestamp}
+
+
+
+
+
+
- com.spotify
+ io.fabric8
docker-maven-plugin
- ${docker.maven.plugin.version}
+ 0.28.0
- ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}
- java:8
- ${onap.nexus.dockerregistry.daily}
- false
-
- ${project.version}
- latest
-
- true
- ["/startup.sh", "start"]
-
-
- /opt
- ${project.build.directory}/opt
-
-
- /
- ${docker.location}
- startup.sh
-
-
-
- chmod 0700 /startup.sh
-
-
- 8080
- 8443
-
+ ${docker.verbose}
+ ${docker.apiVersion}
+ ${docker.pull.registry}
+ ${docker.push.registry}
+
+
+ ${datarouter.prov.image.name}
+
+ try
+ ${basedir}/target/docker-stage
+ Dockerfile
+
+ ${dockertag1}
+ ${dockertag2}
+
+
+
+
+
+
+ generate-images
+ install
+
+ build
+
+
+
+ push-images
+ deploy
+
+ push
+
+
+
@@ -242,7 +283,7 @@
jar-with-dependencies
- ${basedir}/target/opt/app/subscriber/lib
+ ${basedir}/target/docker-stage/opt/app/subscriber/lib
true
@@ -277,12 +318,12 @@
copy-docker-file
- package
+ validate
copy-resources
- ${docker.location}
+ ${basedir}/target/docker-stage
true
@@ -296,18 +337,20 @@
- copy-resources-1
+ copy-startup-script
validate
copy-resources
- ${basedir}/target/opt/app/subscriber/lib
+ ${basedir}/target/docker-stage/opt
+ true
- ${project.basedir}/src/main/resources
+ ${basedir}/src/main/resources/docker
+ true
- **/*.jar
+ startup.sh
@@ -320,7 +363,7 @@
copy-resources
- ${basedir}/target/opt/app/subscriber/etc
+ ${basedir}/target/docker-stage/opt/app/subscriber/etc
${basedir}/src/main/resources