X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-subscriber%2Fpom.xml;h=a2e99366cc1a971157e624aa51964df15547063b;hb=772c41696a481a12b7bf7cbab399094e72ce3fd5;hp=52cb25c749d860378c0b250243df73d60e7bba11;hpb=48a1928544e036190de9a7d7ffbeda7a22a33125;p=dmaap%2Fdatarouter.git
diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index 52cb25c7..a2e99366 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/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,93 +26,63 @@
org.onap.dmaap.datarouter
parent
- 1.0.1-SNAPSHOT
+ ${revision}
../pom.xml
datarouter-subscriber
jar
- datarouter-subscriber
+ /content/sites/site/${project.groupId}/${project.artifactId}/${project.version}
+ ${basedir}/target/${project.artifactId}
+ ${docker.image.root}${project.artifactId}
+ src/main/java/org/onap/dmaap/datarouter/subscriber/**
java
false
- true
- /content/sites/site/${project.groupId}/${project.artifactId}/${project.version}
-
- ${basedir}/target/${artifactId}
- onap/dmaap/datarouter-subscriber
- org.eclipse.jetty
- jetty-server
- ${jetty.version}
+ commons-codec
+ commons-codec
- org.eclipse.jetty
- jetty-continuation
- ${jetty.version}
+ javax.servlet
+ javax.servlet-api
org.eclipse.jetty
- jetty-util
- ${jetty.version}
+ jetty-server
org.eclipse.jetty
- jetty-deploy
- ${jetty.version}
+ jetty-util
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.sonatype.http-testing-harness
+ junit-runner
- org.eclipse.jetty
- jetty-io
- ${jetty.version}
+ org.powermock
+ powermock-module-junit4
- org.apache.httpcomponents
- httpclient
- 4.5.3
-
-
- org.sonatype.http-testing-harness
- junit-runner
- 0.11
-
-
- org.databene
- contiperf
-
-
+ org.mockito
+ mockito-core
junit
junit
- 4.10
- test
+
+
+ commons-io
+ commons-io
log4j
@@ -124,43 +95,51 @@
docker
- false
- false
true
- com.spotify
+ org.codehaus.gmaven
+ gmaven-plugin
+
+
+ io.fabric8
docker-maven-plugin
- 1.0.0
- ${onap.nexus.dockerregistry.daily}/${datarouter.prov.image.name}
- ${docker.location}
- ${onap.nexus.dockerregistry.daily}
- false
-
- ${project.version}
- latest
-
- true
-
-
- /
- ${project.basedir}
-
- target/**/*
- pom.xml
-
-
-
-
- /
- ${project.build.directory}
- **/**
-
-
+
+
+ ${datarouter.sub.image.name}
+
+ try
+ true
+ true
+ ${basedir}/target/docker-stage
+ Dockerfile
+
+ ${dockertag1}
+ ${dockertag2}
+
+
+
+
+
+
+ generate-images
+ install
+
+ build
+
+
+
+ push-images
+ deploy
+
+ push
+
+
+
@@ -176,27 +155,6 @@
**/*.properties
-
- src/main/resources
- true
-
- **/subscriber.properties
-
-
-
- src/main/resources
- true
-
- **/log4j.properties
-
-
-
- src/test/resources
- true
-
- **/log4j.properties
-
-
@@ -206,11 +164,11 @@
jar-with-dependencies
- ${basedir}/target/opt/app/subscriber/lib
+ ${basedir}/target/docker-stage/opt/app/subscriber/lib
true
- org.onap.dmaap.datarouter.subscriber.Subscriber
+ org.onap.dmaap.datarouter.subscriber.SubscriberMain
@@ -229,11 +187,6 @@
org.apache.maven.plugins
maven-compiler-plugin
-
-
- 1.8
-
- 3.6.0
maven-resources-plugin
@@ -241,37 +194,39 @@
copy-docker-file
- package
+ 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/subscriber/lib
+ ${basedir}/target/docker-stage/opt
+ true
- ${project.basedir}/src/main/resources
+ ${basedir}/src/main/resources/docker
+ true
- **/*.jar
+ startup.sh
@@ -284,7 +239,7 @@
copy-resources
- ${basedir}/target/opt/app/subscriber/etc
+ ${basedir}/target/docker-stage/opt/app/subscriber/etc
${basedir}/src/main/resources
@@ -297,96 +252,22 @@
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.10
-
-
- copy-dependencies
- package
-
- copy-dependencies
-
-
- ${project.build.directory}/opt/app/subscriber/lib
- false
- false
- true
-
-
-
-
org.apache.maven.plugins
maven-source-plugin
- 2.2.1
-
-
- attach-sources
-
- jar-no-fork
-
-
-
org.jacoco
jacoco-maven-plugin
- ${jacoco.version}
-
+
- **/gen/**
- **/generated-sources/**
- **/yang-gen/**
- **/pax/**
+ src/main/java/org/onap/dmaap/datarouter/subscriber/**
-
-
-
- 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