From ea45fbffab1f36271def9443fd32cdbd75839f7e Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Tue, 11 Sep 2018 11:13:56 -0400 Subject: Update parent pom to conform to CCSDK structure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie99cd61cc83dff14b2e1a1a1014411342031e27f Issue-ID: CCSDK-505 Signed-off-by: Alexis de Talhouët --- .../adaptors/data-adaptor-provider/pom.xml | 208 ++++++++------ blueprints-processor/adaptors/pom.xml | 38 +-- .../adaptors/rest-adaptor-provider/pom.xml | 301 ++++++++++++--------- 3 files changed, 314 insertions(+), 233 deletions(-) (limited to 'blueprints-processor/adaptors') diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml index d73a21c7f..a965c7fcd 100644 --- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml @@ -17,96 +17,126 @@ --> - 4.0.0 - - org.onap.ccsdk.config - blueprints-processor-adaptors - 0.0.1-SNAPSHOT - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - blueprints-data-adaptor-provider - bundle - Blueprints Data Adaptor - Provider - http://maven.apache.org + + org.onap.ccsdk.parent + binding-parent + 1.1.0-SNAPSHOT + + - - - org.apache.commons - commons-lang3 - - - org.onap.ccsdk.sli.core - sli-provider - compile - - - commons-io - commons-io - - - org.mariadb.jdbc - mariadb-java-client - runtime - - - org.springframework - spring-context - - - org.springframework - spring-jdbc - - - com.att.eelf - eelf-core - - - org.springframework - spring-test - test - - - com.h2database - h2 - test - - - junit - junit - test - - + org.onap.ccsdk.config + 0.3.0-SNAPSHOT + blueprints-data-adaptor-provider + bundle + Blueprints Data Adaptor - Provider + http://maven.apache.org - - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.version} - true - - - org.onap.ccsdk.config.data.adaptor - org.onap.ccsdk.config.data.adaptor, - org.onap.ccsdk.config.data.adaptor.dao, - org.onap.ccsdk.config.data.adaptor.db, - org.onap.ccsdk.config.data.adaptor.domain, - org.onap.ccsdk.config.data.adaptor.service - - !*spring*,!joptsimple,!net.*,!bsh, - !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*, - !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*, - !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*, - !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*, - !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*, - org.*,javax.*,com.google.gson*,com.google.common.*,*jackson* - *;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit* - true - - - - - + + + org.apache.commons + commons-lang3 + ${commons.lang3.version} + + + org.onap.ccsdk.sli.core + sli-provider + ${project.version} + compile + + + commons-io + commons-io + 2.5 + + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.connector.version} + runtime + + + org.springframework + spring-context + 4.2.9.RELEASE + + + org.springframework + spring-beans + 4.2.9.RELEASE + compile + + + org.springframework + spring-jdbc + 4.2.9.RELEASE + + + com.att.eelf + eelf-core + ${eelf.version} + + + org.springframework + spring-test + 4.2.9.RELEASE + test + + + com.h2database + h2 + ${h2database.version} + test + + + junit + junit + ${junit.version} + test + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + org.onap.ccsdk.config.data.adaptor + org.onap.ccsdk.config.data.adaptor, + org.onap.ccsdk.config.data.adaptor.dao, + org.onap.ccsdk.config.data.adaptor.db, + org.onap.ccsdk.config.data.adaptor.domain, + org.onap.ccsdk.config.data.adaptor.service + + !*spring*,!joptsimple,!net.*,!bsh, + !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*, + !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*, + !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*, + !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*, + !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*, + org.*,javax.*,com.google.gson*,com.google.common.*,*jackson* + + + *;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit* + + true + + + + + diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml index 481f48c47..53b6c3ff2 100644 --- a/blueprints-processor/adaptors/pom.xml +++ b/blueprints-processor/adaptors/pom.xml @@ -17,21 +17,25 @@ --> - - org.onap.ccsdk.config - blueprints-processor - 0.0.1-SNAPSHOT - - 4.0.0 - pom - blueprints-processor-adaptors - Blueprints Processor Adaptors - POM - http://wiki.sdn.labs.att.com - Blueprints Processor Adaptors - POM - - data-adaptor-provider - rest-adaptor-provider - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + + org.onap.ccsdk.parent + odlparent-lite + 1.1.0-SNAPSHOT + + + org.onap.ccsdk.config + 0.3.0-SNAPSHOT + 4.0.0 + pom + blueprints-processor-adaptors + Blueprints Processor Adaptors - POM + http://wiki.sdn.labs.att.com + Blueprints Processor Adaptors - POM + + data-adaptor-provider + rest-adaptor-provider + diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml index 5e83a2738..d35f1c1a3 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -17,133 +17,180 @@ --> - 4.0.0 - - org.onap.ccsdk.config - blueprints-processor-adaptors - 0.0.1-SNAPSHOT - - blueprints-rest-adaptor-provider - bundle - Blueprints Rest Adaptor - Provider - http://maven.apache.org + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - - org.apache.commons - commons-lang3 - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - com.fasterxml.jackson.module - jackson-module-jsonSchema - - - org.yaml - snakeyaml - - - org.json - json - - - com.jayway.jsonpath - json-path - - - commons-collections - commons-collections - - - commons-io - commons-io - - - org.apache.httpcomponents - httpclient-osgi - - - org.apache.httpcomponents - httpcore-osgi - - - org.springframework - spring-web - - - com.att.eelf - eelf-core - - - org.springframework - spring-test - test - - - junit - junit - test - - - org.powermock - powermock-api-mockito - test - - - org.powermock - powermock-module-junit4 - test - - + + org.onap.ccsdk.parent + binding-parent + 1.1.0-SNAPSHOT + + - - - - org.apache.felix - maven-bundle-plugin - ${maven.bundle.version} - true - - - org.onap.ccsdk.config.rest.adaptor - org.onap.ccsdk.config.rest.adaptor, - org.onap.ccsdk.config.rest.adaptor.data, - org.onap.ccsdk.config.rest.adaptor.service, - org.onap.ccsdk.config.rest.adaptor.utils - - !*spring*,!joptsimple,!net.*,!bsh, - !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*, - !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*, - !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*, - !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*, - !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*, - org.*,javax.*,com.google.gson*,com.google.common.*,*jackson* - *;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit* - true - - - - - + org.onap.ccsdk.config + 0.3.0-SNAPSHOT + blueprints-rest-adaptor-provider + bundle + Blueprints Rest Adaptor - Provider + http://maven.apache.org + + + + org.apache.commons + commons-lang3 + ${commons.lang3.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jsonSchema + ${jackson.version} + + + org.yaml + snakeyaml + 1.12 + + + org.json + json + ${org.json.version} + + + com.jayway.jsonpath + json-path + 2.3.0 + + + commons-collections + commons-collections + 3.2.2 + + + commons-io + commons-io + 2.5 + + + org.apache.httpcomponents + httpclient-osgi + 4.5.6 + + + org.apache.httpcomponents + httpcore-osgi + 4.4.10 + + + org.springframework + spring-web + 4.2.9.RELEASE + + + com.att.eelf + eelf-core + ${eelf.version} + + + org.springframework + spring-test + 4.2.9.RELEASE + test + + + junit + junit + ${junit.version} + test + + + org.powermock + powermock-api-mockito + 1.6.6 + test + + + org.powermock + powermock-module-junit4 + 1.6.6 + test + + + org.powermock + powermock-core + 1.6.6 + test + + + org.powermock + powermock-api-support + 1.6.6 + test + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + org.onap.ccsdk.config.rest.adaptor + org.onap.ccsdk.config.rest.adaptor, + org.onap.ccsdk.config.rest.adaptor.data, + org.onap.ccsdk.config.rest.adaptor.service, + org.onap.ccsdk.config.rest.adaptor.utils + + !*spring*,!joptsimple,!net.*,!bsh, + !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*, + !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*, + !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*, + !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*, + !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*, + org.*,javax.*,com.google.gson*,com.google.common.*,*jackson* + + + *;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit* + + true + + + + + -- cgit 1.2.3-korg