X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=datarouter-node%2Fpom.xml;h=d9650c23aa04ea3abe5208ca81a8ab37f2036b99;hb=adb2ad2d16e851fbf8dcc71af68949a74463204d;hp=c6bd3e94ffa058641543993fd7e8eef415b88fc1;hpb=8a27631d961de4dfcace31a0107a701b735f6959;p=dmaap%2Fdatarouter.git
diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index c6bd3e94..d9650c23 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,244 +26,180 @@
org.onap.dmaap.datarouter
parent
- 1.0.1-SNAPSHOT
+ ${revision}
../pom.xml
datarouter-node
jar
- datarouter-node
- https://github.com/att/DMAAP_DATAROUTER
+ https://docs.onap.org/en/latest/submodules/dmaap/datarouter.git/docs/index.html
- false
- true
/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}
- ${basedir}/target/${artifactId}
- onap/dmaap/datarouter-node
+ ${basedir}/target/${project.artifactId}
+ ${docker.image.root}${project.artifactId}
+ src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
+ java
+ false
- junit
- junit
- 4.10
- test
+ org.apache.commons
+ commons-lang3
- org.json
- json
- 20160810
+ org.slf4j
+ slf4j-api
- javax.mail
- javax.mail-api
- 1.5.1
+ commons-codec
+ commons-codec
- com.att.eelf
- eelf-core
- 0.0.1
+ commons-io
+ commons-io
+
+
+ org.json
+ json
- com.thoughtworks.xstream
- xstream
- ${thoughtworks.version}
+ com.att.eelf
+ eelf-core
ch.qos.logback
logback-classic
- 1.2.0
- compile
ch.qos.logback
logback-core
- 1.2.0
- compile
- org.eclipse.jetty
- jetty-server
- ${jetty.version}
+ javax.servlet
+ javax.servlet-api
org.eclipse.jetty
- jetty-continuation
- ${jetty.version}
+ jetty-server
org.eclipse.jetty
jetty-util
- ${jetty.version}
-
-
- org.eclipse.jetty
- jetty-deploy
- ${jetty.version}
org.eclipse.jetty
jetty-servlet
- ${jetty.version}
-
-
- org.eclipse.jetty
- jetty-servlets
- ${jetty.version}
org.eclipse.jetty
jetty-http
- ${jetty.version}
-
-
- org.eclipse.jetty
- jetty-security
- ${jetty.version}
-
-
- org.eclipse.jetty
- jetty-websocket
- ${jetty.websocket.version}
-
-
- org.eclipse.jetty
- jetty-io
- ${jetty.version}
-
-
- org.apache.commons
- commons-io
- 1.3.2
-
-
- commons-lang
- commons-lang
- 2.4
- commons-io
- commons-io
- 2.1
- compile
-
-
- org.apache.httpcomponents
- httpcore
- 4.4
-
-
- commons-codec
- commons-codec
- 1.6
+ org.onap.aaf.authz
+ aaf-cadi-core
- org.mozilla
- rhino
- 1.7R3
+ com.intellij
+ annotations
- org.apache.james
- apache-mime4j-core
- 0.7
+ org.hamcrest
+ hamcrest-library
+ test
- org.apache.httpcomponents
- httpclient
- 4.5.3
+ junit
+ junit
+ test
org.sonatype.http-testing-harness
junit-runner
- 0.11
-
-
- org.databene
- contiperf
-
-
-
-
- log4j
- log4j
- 1.2.17
- compile
-
-
- junit
- junit
- 4.10
test
org.mockito
mockito-core
- 1.10.19
test
org.powermock
powermock-module-junit4
- 1.6.4
test
org.powermock
powermock-api-mockito
- 1.6.4
test
- org.apache.commons
- commons-lang3
- 3.0
+ org.powermock
+ powermock-api-support
+ test
+
+
+ org.powermock
+ powermock-core
+ test
+
+
+ org.awaitility
+ awaitility
+ 3.1.6
+ test
docker
- false
- false
true
- com.spotify
+ org.codehaus.gmaven
+ gmaven-plugin
+
+
+ io.fabric8
docker-maven-plugin
- 1.0.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}
- **/**
-
-
+
+
+ ${datarouter.node.image.name}
+
+ try
+ ${basedir}/target/docker-stage
+ Dockerfile
+
+ ${dockertag1}
+ ${dockertag2}
+
+
+
+
+
+
+ generate-images
+ install
+
+ build
+
+
+
+ push-images
+ deploy
+
+ push
+
+
+
-
datarouter-node
@@ -277,14 +214,7 @@
src/main/resources
true
- **/EelfMessages.properties
-
-
-
- src/main/resources
- true
-
- **/log4j.properties
+ **/logback.xml
@@ -292,11 +222,6 @@
org.apache.maven.plugins
maven-compiler-plugin
-
-
- 1.8
-
- 3.6.0
maven-assembly-plugin
@@ -305,11 +230,11 @@
jar-with-dependencies
- ${basedir}/target/opt/app/datartr/lib
+ ${basedir}/target/docker-stage/opt/app/datartr/lib
true
- org.onap.dmaap.datarouter.node.NodeMain
+ org.onap.dmaap.datarouter.node.NodeRunner
@@ -332,80 +257,83 @@
copy-docker-file
- package
+ validate
copy-resources
- ${docker.location}
+ ${basedir}/target/docker-stage
true
${basedir}/src/main/resources/docker
true
- **/*
+ Dockerfile
- copy-resources
+ copy-startup-script
validate
copy-resources
- ${basedir}/target/opt/app/datartr/etc
+ ${basedir}/target/docker-stage/opt
+ true
- ${basedir}/src/main/resources
+ ${basedir}/src/main/resources/docker
+ true
- misc/**
- **/**
+ startup.sh
- copy-resources-1
+ copy-resources-etc
validate
copy-resources
- ${basedir}/target/opt/app/datartr/self_signed
+ ${basedir}/target/docker-stage/opt/app/datartr/etc
- ${basedir}/self_signed
+ ${basedir}/src/main/resources
misc/**
**/**
+
+ aaf/**
+ docker/**
+
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.10
-
- copy-dependencies
- package
+ copy-aaf-props
+ validate
- copy-dependencies
+ copy-resources
- ${project.build.directory}/opt/app/datartr/lib
- false
- false
- true
+ ${basedir}/target/docker-stage/opt/app/osaaf/local
+
+
+ ${basedir}/src/main/resources/aaf
+
+ **/**
+
+
+
@@ -413,111 +341,27 @@
org.apache.maven.plugins
maven-javadoc-plugin
-
- false
-
-
-
- attach-javadocs
-
- jar
-
-
-
org.apache.maven.plugins
maven-source-plugin
- 2.2.1
-
-
- attach-sources
-
- jar-no-fork
-
-
-
org.codehaus.mojo
cobertura-maven-plugin
- 2.7
-
-
- html
- xml
-
-
-
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.7
- true
-
- ${onap.nexus.url}
- 176c31dfe190a
- ecomp-staging
-
org.jacoco
jacoco-maven-plugin
- ${jacoco.version}
- **/gen/**
- **/generated-sources/**
- **/yang-gen/**
- **/pax/**
+ src/main/java/org/onap/dmaap/datarouter/node/NodeRunner.java
-
-
- pre-unit-test
-
- prepare-agent
-
-
- ${project.build.directory}/code-coverage/jacoco-ut.exec
- surefireArgLine
-
-
-
- post-unit-test
- test
-
- report
-
-
- ${project.build.directory}/code-coverage/jacoco-ut.exec
- ${project.reporting.outputDirectory}/jacoco-ut
-
-
-
- pre-integration-test
- pre-integration-test
-
- prepare-agent
-
-
- ${project.build.directory}/code-coverage/jacoco-it.exec
- failsafeArgLine
-
-
-
- post-integration-test
- post-integration-test
-
- report
-
-
- ${project.build.directory}/code-coverage/jacoco-it.exec
- ${project.reporting.outputDirectory}/jacoco-it
-
-
-
+
+
+ org.codehaus.mojo
+ properties-maven-plugin