X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fpom.xml;h=d0f757bd576c2a86a46ea58210518dce86a87fb2;hb=b60213dc26540543f500b3442b061565907c3cf8;hp=d384c0da045f0df090d1f754cf8dc05ca6aabe8e;hpb=bd4e22f5861fb2ebe82c8bd553c86503971591a6;p=dmaap%2Fdatarouter.git
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index d384c0da..d0f757bd 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -26,7 +26,7 @@
org.onap.dmaap.datarouter
parent
- 1.0.6-SNAPSHOT
+ 2.1.0-SNAPSHOT
../pom.xml
datarouter-prov
@@ -41,6 +41,12 @@
${basedir}/target/${artifactId}
onap/dmaap/datarouter-prov
+
+ ${maven.build.timestamp}
+ yyyyMMdd'T'HHmmss'Z'
+
+ true
+ 1.23
@@ -231,12 +237,6 @@
cdi-websocket
${jetty.version}
-
- log4j
- log4j
- 1.2.17
- compile
-
com.h2database
h2
@@ -253,6 +253,11 @@
+
+ org.onap.aaf.authz
+ aaf-cadi-aaf
+ ${aaf-cadi-aaf.version}
+
@@ -264,40 +269,78 @@
+
+
- com.spotify
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+
+ ${project.version}
+ ${maven.build.timestamp}
+
+
+
+
+
+
+
+ io.fabric8
docker-maven-plugin
- 1.0.0
+ 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
+
+
+
@@ -327,20 +370,6 @@
**/EelfMessages.properties
-
- src/main/resources
- true
-
- **/log4j.properties
-
-
-
- src/test/resources
- true
-
- **/log4j.properties
-
-
@@ -350,7 +379,7 @@
jar-with-dependencies
- ${basedir}/target/opt/app/datartr/lib
+ ${basedir}/target/docker-stage/opt/app/datartr/lib
true
@@ -379,43 +408,47 @@
3.6.0
+
+
maven-resources-plugin
2.7
- copy-docker-file
- package
+ copy-dockerfile
+ validate
copy-resources
- ${docker.location}
+ ${basedir}/target/docker-stage
true
${basedir}/src/main/resources/docker
true
- **/*
+ Dockerfile
- copy-resources-1
+ copy-startup-script
validate
copy-resources
- ${basedir}/target/opt/app/datartr/lib
+ ${basedir}/target/docker-stage/opt
+ true
- ${project.basedir}/src/main/resources
+ ${basedir}/src/main/resources/docker
+ true
- **/*.jar
+ startup.sh
@@ -428,7 +461,7 @@
copy-resources
- ${basedir}/target/opt/app/datartr/etc
+ ${basedir}/target/docker-stage/opt/app/datartr/etc
${basedir}/src/main/resources
@@ -447,7 +480,7 @@
copy-resources
- ${basedir}/target/opt/app/datartr
+ ${basedir}/target/docker-stage/opt/app/datartr
${basedir}/data
@@ -466,7 +499,7 @@
copy-resources
- ${basedir}/target/opt/app/datartr/aaf_certs
+ ${basedir}/target/docker-stage/opt/app/datartr/aaf_certs
${basedir}/aaf_certs
@@ -492,7 +525,7 @@
copy-dependencies
- ${project.build.directory}/opt/app/datartr/lib
+ ${basedir}/target/docker-stage/opt/app/datartr/aaf_certs
false
false
true