X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fpom.xml;h=284a8cac15676dc69aee61cfd53747d1639ae123;hb=5775de7b0fc84a29511dc4a1a480c3ab32da2ade;hp=a348c7844031e0aad2187183b246c53412423a67;hpb=da23b25192b0f2838e27e93b88e05e07756adbb0;p=dmaap%2Fdatarouter.git
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index a348c784..284a8cac 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -3,13 +3,14 @@
* 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.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +26,7 @@
org.onap.dmaap.datarouter
parent
- 1.0.1-SNAPSHOT
+ 2.0.2-SNAPSHOT
../pom.xml
datarouter-prov
@@ -40,24 +41,50 @@
${basedir}/target/${artifactId}
onap/dmaap/datarouter-prov
+
+ ${maven.build.timestamp}
+ yyyyMMdd'T'HHmmss'Z'
+
+ true
+ 1.23
+
+ xml-apis
+ xml-apis
+ ${xml-apis.version}
+
+
+ org.dom4j
+ dom4j
+ ${dom4j.version}
+
+
+ commons-codec
+ commons-codec
+ ${commons-codec.version}
+
+
+ com.google.guava
+ guava
+ ${google.guava.version}
+
ch.qos.logback
logback-classic
- 1.2.0
+ ${qos.logback.version}
compile
ch.qos.logback
logback-core
- 1.2.0
+ ${qos.logback.version}
compile
com.thoughtworks.xstream
xstream
- 1.4.7
+ ${thoughtworks.version}
org.json
@@ -67,67 +94,62 @@
javax.mail
javax.mail-api
- 1.5.1
+ ${javax.mail-api.version}
com.att.eelf
eelf-core
0.0.1
-
- javax.servlet
- servlet-api
- 2.5
-
org.eclipse.jetty
jetty-server
- 7.6.14.v20131031
+ ${jetty.version}
org.eclipse.jetty
jetty-continuation
- 7.6.14.v20131031
+ ${jetty.version}
org.eclipse.jetty
jetty-util
- 7.6.14.v20131031
+ ${jetty.version}
org.eclipse.jetty
jetty-deploy
- 7.6.14.v20131031
+ ${jetty.version}
org.eclipse.jetty
jetty-servlet
- 7.6.14.v20131031
+ ${jetty.version}
org.eclipse.jetty
jetty-servlets
- 7.6.14.v20131031
+ ${jetty.version}
org.eclipse.jetty
jetty-http
- 7.6.14.v20131031
+ ${jetty.version}
org.eclipse.jetty
jetty-security
- 7.6.14.v20131031
+ ${jetty.version}
org.eclipse.jetty
jetty-websocket
- 7.6.14.v20131031
+ ${jetty.websocket.version}
org.eclipse.jetty
jetty-io
- 7.6.14.v20131031
+ ${jetty.version}
org.apache.commons
@@ -200,16 +222,20 @@
1.6.4
test
-
- mysql
- mysql-connector-java
- 5.1.21
+ org.apache.commons
+ commons-lang3
+ 3.0
+
+
+ org.mariadb.jdbc
+ mariadb-java-client
+ 2.2.5
org.eclipse.jetty.cdi
cdi-websocket
- 9.3.11.v20160721
+ ${jetty.version}
log4j
@@ -217,19 +243,115 @@
1.2.17
compile
+
+ com.h2database
+ h2
+ 1.4.197
+
+
+ org.hibernate
+ hibernate-entitymanager
+ 5.2.9.Final
+
+
+ dom4j
+ dom4j
+
+
+
+
+ org.onap.aaf.authz
+ aaf-cadi-aaf
+ ${aaf-cadi-aaf.version}
+
-
docker
- false
- false
- false
+ false
+ false
+ true
+
+
+
+
+
+ org.codehaus.groovy.maven
+ gmaven-plugin
+
+
+ validate
+
+ execute
+
+
+
+ ${project.version}
+ ${maven.build.timestamp}
+
+
+
+
+
+
+
+ io.fabric8
+ docker-maven-plugin
+ 0.28.0
+
+ ${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
+
+
+
+
+
+
-
datarouter-prov
@@ -244,7 +366,7 @@
src/main/resources
true
- **/proserver.properties
+ **/provserver.properties
@@ -261,7 +383,13 @@
**/log4j.properties
-
+
+ src/test/resources
+ true
+
+ **/log4j.properties
+
+
@@ -271,7 +399,7 @@
jar-with-dependencies
- ${basedir}/target/opt/app/datartr/lib
+ ${basedir}/target/docker-stage/opt/app/datartr/lib
true
@@ -300,129 +428,47 @@
3.6.0
-
- com.spotify
- docker-maven-plugin
- ${docker.maven.plugin.version}
-
- false
- ${datarouter.prov.image.name}
- ${docker.location}
- docker-hub
-
- ${project.version}
- latest
-
- true
-
-
- /
- ${docker.location}
- ${project.build.finalName}.jar
-
-
- /
- ${project.build.directory}
- **/**
-
-
-
-
-
- build-image
- install
-
- build
-
-
- ${skip.docker.build}
-
-
-
- tag-image-project-version
- install
-
- tag
-
-
- ${datarouter.prov.image.name}
- ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:${project.version}
- ${skip.docker.push}
-
-
-
- tag-image-latest
- install
-
- tag
-
-
- ${datarouter.prov.image.name}
- ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:latest
- ${skip.docker.push}
-
-
-
- push-image-latest
- deploy
-
- push
-
-
- ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:${project.version}
- ${skip.docker.push}
-
-
-
- push-image
- deploy
-
- push
-
-
- ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}:latest
- ${skip.docker.push}
-
-
-
-
+
+
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
@@ -435,7 +481,7 @@
copy-resources
- ${basedir}/target/opt/app/datartr/etc
+ ${basedir}/target/docker-stage/opt/app/datartr/etc
${basedir}/src/main/resources
@@ -454,7 +500,7 @@
copy-resources
- ${basedir}/target/opt/app/datartr
+ ${basedir}/target/docker-stage/opt/app/datartr
${basedir}/data
@@ -473,10 +519,10 @@
copy-resources
- ${basedir}/target/opt/app/datartr/self_signed
+ ${basedir}/target/docker-stage/opt/app/datartr/aaf_certs
- ${basedir}/self_signed
+ ${basedir}/aaf_certs
misc/**
**/**
@@ -499,7 +545,7 @@
copy-dependencies
- ${project.build.directory}/opt/app/datartr/lib
+ ${basedir}/target/docker-stage/opt/app/datartr/aaf_certs
false
false
true
@@ -553,7 +599,7 @@
1.6.7
true
- ${onap.nexus.dockerregistry.daily}
+ ${onap.nexus.url}
176c31dfe190a
ecomp-staging
@@ -618,26 +664,4 @@
-
-
- ecomp-releases
- DR Release Repository
- ${onap.nexus.url}${releaseNexusPath}
-
-
- ecomp-snapshots
- DR Snapshot Repository
- ${onap.nexus.url}${snapshotNexusPath}
-
-
- ecomp-site
- dav:${onap.nexus.url}${sitePath}
-
-
-
-
- onap-plugin-snapshots
- ${onap.nexus.url}${snapshotNexusPath}
-
-