X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-subscriber%2Fpom.xml;h=d7294a336a5d5327c7aa8110ecd16f0fbc76d4b3;hb=7fdcc68d546fe95a7863de512bcda09f01e5d39e;hp=cc1d4868cbecbfb8a819ad3338a14fe026ae465c;hpb=fb6bfe73b73a2eeb543883d0da14e301e0066aa2;p=dmaap%2Fdatarouter.git
diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index cc1d4868..d7294a33 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,120 +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
-
- com.google.guava
- guava
- ${google.guava.version}
-
commons-codec
commons-codec
- ${commons-codec.version}
- 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}
-
-
- com.thoughtworks.xstream
- xstream
- ${thoughtworks.version}
-
-
- ch.qos.logback
- logback-classic
- ${qos.logback.version}
- compile
- ch.qos.logback
- logback-core
- ${qos.logback.version}
- compile
+ org.sonatype.http-testing-harness
+ junit-runner
- org.apache.httpcomponents
- httpclient
- 4.5.3
+ org.powermock
+ powermock-module-junit4
- 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
@@ -146,53 +90,54 @@
1.2.17
compile
-
- org.apache.commons
- commons-io
- 1.3.2
-
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
+ ${basedir}/target/docker-stage
+ Dockerfile
+
+ ${dockertag1}
+ ${dockertag2}
+
+
+
+
+
+
+ generate-images
+ install
+
+ build
+
+
+
+ push-images
+ deploy
+
+ push
+
+
+
@@ -238,7 +183,7 @@
jar-with-dependencies
- ${basedir}/target/opt/app/subscriber/lib
+ ${basedir}/target/docker-stage/opt/app/subscriber/lib
true
@@ -261,11 +206,6 @@
org.apache.maven.plugins
maven-compiler-plugin
-
-
- 1.8
-
- 3.6.0
maven-resources-plugin
@@ -273,12 +213,12 @@
copy-docker-file
- package
+ validate
copy-resources
- ${docker.location}
+ ${basedir}/target/docker-stage
true
@@ -292,18 +232,20 @@
- 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
@@ -316,7 +258,7 @@
copy-resources
- ${basedir}/target/opt/app/subscriber/etc
+ ${basedir}/target/docker-stage/opt/app/subscriber/etc
${basedir}/src/main/resources
@@ -332,19 +274,12 @@
org.apache.maven.plugins
maven-dependency-plugin
- 2.10
copy-dependencies
package
-
- copy-dependencies
-
- ${project.build.directory}/opt/app/subscriber/lib
- false
- false
- true
+ ${project.build.directory}/docker-stage/opt/app/subscriber/lib
@@ -352,73 +287,19 @@
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