X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-node%2Fpom.xml;h=a12164dc0b38b0af864b565ec8b31f31b8e2b53f;hb=0fa019897cb79de1def349b8fd0b660d1951681a;hp=27d21c051e4ca4534c7a3bc38c67e3158414138d;hpb=5a41037c1c6085febf8d5d9a41f055c9bca3f0d1;p=dmaap%2Fdatarouter.git
diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 27d21c05..a12164dc 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -26,7 +26,7 @@
org.onap.dmaap.datarouter
parent
- 1.0.3-SNAPSHOT
+ 2.1.0-SNAPSHOT
../pom.xml
datarouter-node
@@ -38,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
@@ -192,12 +196,6 @@
1.2.17
compile
-
- junit
- junit
- 4.10
- test
-
org.mockito
mockito-core
@@ -221,6 +219,11 @@
commons-lang3
3.0
+
+ org.onap.aaf.authz
+ aaf-cadi-aaf
+ ${aaf-cadi-aaf.version}
+
@@ -232,40 +235,78 @@
+
+
- com.spotify
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+
+ ${project.version}
+ ${maven.build.timestamp}
+
+
+
+
+
+
+
+ io.fabric8
docker-maven-plugin
- ${docker.maven.plugin.version}
+ 0.28.0
- ${onap.nexus.dockerregistry.daily}/${datarouter.node.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.node.image.name}
+
+ try
+ ${basedir}/target/docker-stage
+ Dockerfile
+
+ ${dockertag1}
+ ${dockertag2}
+
+
+
+
+
+
+ generate-images
+ install
+
+ build
+
+
+
+ push-images
+ deploy
+
+ push
+
+
+
@@ -314,7 +355,7 @@
jar-with-dependencies
- ${basedir}/target/opt/app/datartr/lib
+ ${basedir}/target/docker-stage/opt/app/datartr/lib
true
@@ -341,12 +382,12 @@
copy-docker-file
- package
+ validate
copy-resources
- ${docker.location}
+ ${basedir}/target/docker-stage
true
@@ -360,13 +401,33 @@
- copy-resources
+ copy-startup-script
+ validate
+
+ copy-resources
+
+
+ ${basedir}/target/docker-stage/opt
+ true
+
+
+ ${basedir}/src/main/resources/docker
+ true
+
+ startup.sh
+
+
+
+
+
+
+ copy-resources-2
validate
copy-resources
- ${basedir}/target/opt/app/datartr/etc
+ ${basedir}/target/docker-stage/opt/app/datartr/etc
${basedir}/src/main/resources
@@ -379,13 +440,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
@@ -411,7 +491,7 @@
copy-dependencies
- ${project.build.directory}/opt/app/datartr/lib
+ ${project.build.directory}/docker-stage/opt/app/datartr/lib
false
false
true