From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Fri, 9 Jun 2017 03:19:04 +0300 Subject: [SDC-29] catalog 1707 rebase commit. Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando --- catalog-fe/pom.xml | 675 +++++++++++++++++++++++++---------------------------- 1 file changed, 314 insertions(+), 361 deletions(-) (limited to 'catalog-fe/pom.xml') diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml index 3518779952..a3acabb41f 100644 --- a/catalog-fe/pom.xml +++ b/catalog-fe/pom.xml @@ -5,387 +5,306 @@ catalog-fe war - - org.openecomp.sdc sdc-main 1.1.0-SNAPSHOT + + + org.functionaljava + functionaljava + ${functionaljava.version} + compile + - + + org.openecomp.sdc + security-utils + ${project.version} + compile + - junit - junit - 4.12 - test + org.openecomp.sdc + common-app-api + ${project.version} + - org.testng - testng - 6.9.10 - test + org.slf4j + slf4j-api + ${slf4j-api.version} + compile - org.springframework - spring-core - ${spring.version} - provided + ch.qos.logback + logback-classic + ${logback.version} + compile - org.springframework - spring-beans - ${spring.version} - provided + ch.qos.logback + logback-core + ${logback.version} + compile - org.springframework - spring-context - ${spring.version} - provided + org.codehaus.groovy + groovy-all + ${groovy.version} + compile - org.springframework - spring-context-support - ${spring.version} - provided + org.codehaus.janino + janino + ${janino.version} + compile - org.springframework - spring-messaging - ${spring.version} - provided + org.yaml + snakeyaml + ${snakeyaml.version} + compile - org.springframework - spring-web - ${spring.version} - provided + org.apache.commons + commons-jci-core + ${commons-jci-core.version} + compile - org.springframework - spring-webmvc - ${spring.version} - provided + com.google.code.gson + gson + ${gson.version} + compile - org.springframework - spring-aop - ${spring.version} - provided + org.glassfish.jersey.containers + jersey-container-servlet + ${jersey-bom.version} + compile - org.springframework - spring-aspects - ${spring.version} - provided + org.glassfish.jersey.media + jersey-media-multipart + ${jersey-bom.version} + compile - org.springframework - spring-expression - ${spring.version} - test + org.glassfish.jersey.media + jersey-media-moxy + ${jersey-bom.version} + compile + + javax.mail + javax.mail-api + 1.5.2 + compile + - org.functionaljava - functionaljava + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey-bom.version} compile - + - org.openecomp.sdc - security-utils - ${security-utils.version} - compile - - - org.openecomp.sdc - common-app-api - ${common-app-api.version} - - - - - org.slf4j - slf4j-api - 1.7.10 - compile - - - - ch.qos.logback - logback-classic - ${logback.version} - compile - - - - ch.qos.logback - logback-core - ${logback.version} - compile - - - - org.codehaus.groovy - groovy-all - ${groovy.version} - compile - - - - org.codehaus.janino - janino - ${janino.version} - compile - - - - org.yaml - snakeyaml - 1.14 - compile - - - - org.apache.commons - commons-jci-core - compile - - - - com.google.code.gson - gson - 2.3.1 - compile - - - - org.glassfish.jersey.containers - jersey-container-servlet - 2.24 - compile - - - - org.glassfish.jersey.media - jersey-media-multipart - compile - - - - org.glassfish.jersey.media - jersey-media-moxy - compile - - - - javax.mail - javax.mail-api - 1.5.2 - compile - - - - org.glassfish.jersey.media - jersey-media-json-jackson - compile - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - compile - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - compile - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - compile - - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - compile - - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - compile - - - - org.apache.httpcomponents - httpmime - - ${httpclient.version} - compile - - - - commons-logging - commons-logging - 1.2.1-SNAPSHOT - compile - - - - commons-codec - commons-codec - 2.0-SNAPSHOT - compile - - - - - javax.servlet - servlet-api - provided - - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - compile - - - - - org.eclipse.jetty - jetty-proxy - ${jetty.version} - compile - + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + compile + - - org.eclipse.jetty - jetty-servlets - ${jetty.servlets.version} - compile - - - - - com.google.guava - guava - ${guava.version} - compile - - - - - com.jcabi - jcabi-aspects - compile - - - org.aspectj - aspectjrt - ${aspectjrt.version} - compile - - - org.apache.commons - commons-lang3 - ${lang3.version} - compile - - - - - org.openecomp.ecompsdkos - ecompFW - ${ecomp.version} - compile - - - com.att.nsa - cambriaClient - - - slf4j-log4j12 - org.slf4j - - - - - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-bundle - pom - test - - - - org.eclipse.jetty - jetty-servlet - test - + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + compile + - - org.eclipse.jetty - jetty-webapp - test - + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.annotations.version} + compile + - - org.mockito - mockito-all - 1.10.19 - test - + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + compile + - - org.springframework - spring-test - ${spring.version} - test - - + + org.apache.httpcomponents + httpcore + ${httpcore.version} + compile + + + org.apache.httpcomponents + httpmime + ${httpclient.version} + + compile + + + commons-logging + commons-logging + ${commons-logging} + compile + + + commons-codec + commons-codec + ${commons-codec} + compile + + + + javax.servlet + servlet-api + ${servlet-api.version} + provided + - + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + compile + - ${project.artifactId}-${project.version} + + + org.eclipse.jetty + jetty-proxy + ${jetty.version} + compile + - - + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + provided + + + + + com.google.guava + guava + ${guava.version} + compile + + + + + com.jcabi + jcabi-aspects + ${jcabi.version} + compile + + + org.aspectj + aspectjrt + ${aspectjrt.version} + compile + + + + org.apache.commons + commons-lang3 + ${lang3.version} + compile + + + + + org.openecomp.ecompsdkos + ecompFW + ${ecomp.version} + compile + + + com.att.nsa + cambriaClient + + + slf4j-log4j12 + org.slf4j + + + + + + org.fusesource + sigar + ${sigar.version} + compile + + + + + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-bundle + ${jersey-bom.version} + pom + test + + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + test + + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + test + + + + org.mockito + mockito-all + ${mockito.version} + test + + + + + + + ${project.artifactId}-${project.version} + + org.apache.maven.plugins maven-war-plugin @@ -396,7 +315,7 @@ true - + src/main/resources @@ -405,8 +324,6 @@ - - org.apache.maven.plugins maven-dependency-plugin @@ -439,16 +356,14 @@ ${project.parent.basedir}/sdc-os-chef/sdc-frontend/ - - - org.eclipse.jetty jetty-maven-plugin - 9.0.6.v20130930 + ${jetty.version} + / @@ -463,6 +378,9 @@ org.apache.maven.plugins maven-deploy-plugin 2.7 + + true + @@ -477,36 +395,12 @@ - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.6 - - ${project.artifactId}-${full.release.version}${build.type} - false - ${project.basedir}/tarball.xml - - - - - assembly-tar-file - package - - single - - - - - + only. It has no influence on the Maven build itself. --> org.eclipse.m2e lifecycle-mapping @@ -514,7 +408,7 @@ - + com.jcabi @@ -528,22 +422,81 @@ - + - + - - - - - - + + + + catalog + + false + + + + + + ${project.artifactId}-${full.release.version} + + + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + + false + initialize + + read-project-properties + + + + ${project.parent.build.directory}/FullReleaseVersion.properties + + + + + + + + + + + + Fortify + + false + + + + + + com.fortify.ps.maven.plugin + sca-maven-plugin + 4.30 + + 1.8 + ${project.parent.artifactId} + ${project.parent.artifactId} + + + + + + -- cgit 1.2.3-korg