From 1c11ab87dd4954903734c8a95a17a56aefea4758 Mon Sep 17 00:00:00 2001 From: efiacor Date: Tue, 9 Apr 2019 13:52:17 +0000 Subject: pom updates for version settings Refactored some of the fabric8 also. Change-Id: Ib5a62cab9d917728d42f54a1bbe42b937d48793e Issue-ID: DMAAP-854 Signed-off-by: efiacor --- datarouter-subscriber/pom.xml | 254 +++++++----------------------------------- 1 file changed, 41 insertions(+), 213 deletions(-) (limited to 'datarouter-subscriber') diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml index 96d55b71..6c577a32 100755 --- a/datarouter-subscriber/pom.xml +++ b/datarouter-subscriber/pom.xml @@ -26,123 +26,62 @@ org.onap.dmaap.datarouter parent - 2.1.0-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} java false - true - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - - ${basedir}/target/${artifactId} - onap/dmaap/datarouter-subscriber - - ${maven.build.timestamp} - yyyyMMdd'T'HHmmss'Z' - - 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 + org.sonatype.http-testing-harness + junit-runner - ch.qos.logback - logback-core - ${qos.logback.version} - compile + 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 @@ -150,66 +89,26 @@ 1.2.17 compile - - org.apache.commons - commons-io - 1.3.2 - docker - false - false true - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - ${project.version} - ${maven.build.timestamp} - - - println 'ver: ' + project.properties['ver']; - if ( project.properties['ver'].endsWith("-SNAPSHOT") ) { - project.properties['dockertag1']=project.properties['ver'] + "-latest"; - project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp']; - } else { - project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest"; - project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp']; - } - println 'docker tag 1: ' + project.properties['dockertag1']; - println 'docker tag 2: ' + project.properties['dockertag2']; - - - - + org.codehaus.gmaven + gmaven-plugin io.fabric8 docker-maven-plugin - 0.28.0 - ${docker.verbose} - ${docker.apiVersion} - ${docker.pull.registry} - ${docker.push.registry} - ${datarouter.prov.image.name} + ${datarouter.sub.image.name} try ${basedir}/target/docker-stage @@ -222,22 +121,22 @@ - - - generate-images - install - - build - - - - push-images - deploy - - push - - - + + + generate-images + install + + build + + + + push-images + deploy + + push + + + @@ -306,11 +205,6 @@ org.apache.maven.plugins maven-compiler-plugin - - 1.8 - 1.8 - - 3.6.0 maven-resources-plugin @@ -379,19 +273,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 @@ -399,73 +286,14 @@ 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/** - - - - - 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 -- cgit 1.2.3-korg