X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-subscriber%2Fpom.xml;h=1f58c42c1b5632267b50f6192d5c80bbd0d2f622;hb=b4350f96ad8ad5f4377831be13e5ebe367eb183b;hp=87b82f1d0dbb6a04bec5b3bfbb95d1241d840e25;hpb=9c8a0690aa5a1e22332e78f685362af5b4a8fbe5;p=dmaap%2Fdatarouter.git
diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index 87b82f1d..1f58c42c 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -3,6 +3,7 @@
* org.onap.dmaap
* ===========================================================================
* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 Nokia. All rights reserved.
* ===========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@
org.onap.dmaap.datarouter
parent
- 1.0.2-SNAPSHOT
+ 2.0.2-SNAPSHOT
../pom.xml
datarouter-subscriber
@@ -39,6 +40,9 @@
${basedir}/target/${artifactId}
onap/dmaap/datarouter-subscriber
+
+ ${maven.build.timestamp}
+ yyyyMMdd'T'HHmmss'Z'
@@ -162,37 +166,78 @@
+
+
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+
+ ${project.version}
+ ${maven.build.timestamp}
+
+
+
+
+
+
- com.spotify
+ io.fabric8
docker-maven-plugin
- 1.0.0
+ 0.28.0
- ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}
- ${docker.location}
- ${onap.nexus.dockerregistry.daily}
- false
-
- ${project.version}
- latest
-
- true
-
-
- /
- ${project.basedir}
-
- target/**/*
- pom.xml
-
-
-
-
- /
- ${project.build.directory}
- **/**
-
-
+ ${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
+
+
+
@@ -238,7 +283,7 @@
jar-with-dependencies
- ${basedir}/target/opt/app/subscriber/lib
+ ${basedir}/target/docker-stage/opt/app/subscriber/lib
true
@@ -273,12 +318,12 @@
copy-docker-file
- package
+ validate
copy-resources
- ${docker.location}
+ ${basedir}/target/docker-stage
true
@@ -292,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
@@ -316,7 +363,7 @@
copy-resources
- ${basedir}/target/opt/app/subscriber/etc
+ ${basedir}/target/docker-stage/opt/app/subscriber/etc
${basedir}/src/main/resources