X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-node%2Fpom.xml;h=3e75e88ceeaa54bd606c861a329ecc656555015b;hb=efad46124485f1572765fad05284d8a070fb9277;hp=f9bdce67eb2638739ee745c29d66216940e68fa9;hpb=91caae9521e119b49a3b66ea55aa0ca237f8e72f;p=dmaap%2Fdatarouter.git
diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index f9bdce67..3e75e88c 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/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.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
../pom.xml
datarouter-node
@@ -37,6 +38,10 @@
true
/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}
${basedir}/target/${artifactId}
+
+ ${maven.build.timestamp}
+ yyyyMMdd'T'HHmmss'Z'
+
onap/dmaap/datarouter-node
@@ -191,12 +196,6 @@
1.2.17
compile
-
- junit
- junit
- 4.10
- test
-
org.mockito
mockito-core
@@ -231,37 +230,78 @@
+
+
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+
+ ${project.version}
+ ${maven.build.timestamp}
+
+
+ println 'ver: ' + 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'];
+
+
+
+
+
- com.spotify
+ io.fabric8
docker-maven-plugin
- 1.0.0
+ 0.28.0
- ${onap.nexus.dockerregistry.daily}/${datarouter.node.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.node.image.name}
+
+ try
+ ${basedir}/target/docker-stage
+ Dockerfile
+
+ ${dockertag1}
+ ${dockertag2}
+
+
+
+
+
+
+ generate-images
+ install
+
+ build
+
+
+
+ push-images
+ deploy
+
+ push
+
+
+
@@ -310,7 +350,7 @@
jar-with-dependencies
- ${basedir}/target/opt/app/datartr/lib
+ ${basedir}/target/docker-stage/opt/app/datartr/lib
true
@@ -337,12 +377,12 @@
copy-docker-file
- package
+ validate
copy-resources
- ${docker.location}
+ ${basedir}/target/docker-stage
true
@@ -356,13 +396,33 @@
- copy-resources
+ copy-startup-script
validate
copy-resources
- ${basedir}/target/opt/app/datartr/etc
+ ${basedir}/target/docker-stage/opt
+ true
+
+
+ ${basedir}/src/main/resources/docker
+ true
+
+ startup.sh
+
+
+
+
+
+
+ copy-resources-2
+ validate
+
+ copy-resources
+
+
+ ${basedir}/target/docker-stage/opt/app/datartr/etc
${basedir}/src/main/resources
@@ -375,13 +435,32 @@
- copy-resources-1
+ copy-resources-3
+ validate
+
+ copy-resources
+
+
+ ${basedir}/target/docker-stage/opt/app/datartr
+
+
+ ${basedir}/data
+
+ misc/**
+ **/**
+
+
+
+
+
+
+ copy-resources-4
validate
copy-resources
- ${basedir}/target/opt/app/datartr/aaf_certs
+ ${basedir}/target/docker-stage/opt/app/datartr/aaf_certs
${basedir}/aaf_certs
@@ -407,7 +486,7 @@
copy-dependencies
- ${project.build.directory}/opt/app/datartr/lib
+ ${project.build.directory}/docker-stage/opt/app/datartr/lib
false
false
true