From 7b1f813441f94261f43ec4f5bb0944ad2570fbdf Mon Sep 17 00:00:00 2001 From: "Blackwell, Ian (ib733q)" Date: Tue, 3 Apr 2018 17:28:44 +0100 Subject: Revisions made to the Model Loader to use Babel Change the Model Loader to use the Babel micro service. Responsibility for transformation of ASDC TOSCA models, the yaml files, has been moved from ASDC and placed into the Bable microservice. Model Loader will forward any CSAR received from ASDC and delegate transformation to Babel. Babel will return the transformed TOSCA models to Model Loader which will then ingest them into the A&AI Inventory. Issue-ID: AAI-987 Change-Id: I99594770b51b00cb7dcc0f30706060ae27cd94c5 Signed-off-by: Blackwell, Ian (ib733q) --- pom.xml | 270 +++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 175 insertions(+), 95 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index cad4f4e..242b623 100644 --- a/pom.xml +++ b/pom.xml @@ -1,22 +1,24 @@ + ============LICENSE_START========================================== + org.onap.aai + =================================================================== + Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + Copyright © 2017-2018 Amdocs + =================================================================== + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END============================================ + --> + 4.0.0 @@ -30,7 +32,6 @@ org.onap.aai.model-loader model-loader 1.2.0-SNAPSHOT - aai-model-loader ${basedir}/target @@ -41,10 +42,23 @@ /appl/${project.artifactId}/${project.version} ${basedir}/target/swm/package/nix/dist_files${distFilesRoot} + 2.0.1 + 3.6 + 1.1 + 1.14 + 2.8.1 + 1.10.19 + 1.6.2 + 1.1.1 + 1.18 + 2.7 + 1.3 + 0.7.9 + - 0 + 9500 0 @@ -66,7 +80,9 @@ ${project.build.directory}/coverage-reports/jacoco.exec false ${project.version} - https://nexus.onap.org + https://nexus.openecomp.org + 1.2.0-SNAPSHOT + 1.2.1 @@ -83,22 +99,68 @@ + + org.onap.aai + babel + ${babel.version} + client + + + * + * + + + + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.rs-api.version} + + + javax.ws.rs + jsr311-api + ${jsr311-api.version} + + + + com.sun.jersey + jersey-client + ${jersey-client.version} + + + org.onap.aai + rest-client + ${aai.rest.client.version} + + + com.google.code.gson + gson + ${gson.version} + + + + + org.hamcrest + hamcrest-all + ${hamcrest-all.version} + test + org.mockito - mockito-all - 1.10.19 + mockito-core + ${mockito.version} test org.powermock powermock-module-junit4 - 1.6.2 + ${powermock.version} test org.powermock powermock-api-mockito - 1.6.2 + ${powermock.version} test @@ -113,6 +175,17 @@ + + org.javassist + javassist + 3.19.0-GA + + + com.fasterxml.jackson.core + jackson-core + ${fasterxml.version} + + javax.xml.bind @@ -140,16 +213,18 @@ 2.6.2 compile + - com.sun.jersey - jersey-client - 1.18 + com.mikesamuel + json-sanitizer + 1.2.0 + org.onap.aai.logging-service common-logging - 1.1.0 + 1.2.2 ch.qos.logback @@ -159,7 +234,7 @@ org.openecomp.sdc.sdc-distribution-client sdc-distribution-client - 1.1.32 + 1.2.2 org.apache.httpcomponents @@ -169,7 +244,7 @@ org.json json - 20131018 + 20131018 org.eclipse.jetty @@ -179,13 +254,38 @@ org.springframework spring-webmvc - 4.0.0.RELEASE jline jline 2.12.1 + + org.yaml + snakeyaml + 1.18 + + + + + org.apache.commons + commons-compress + ${commons-compress.version} + + + commons-io + commons-io + + + org.apache.commons + commons-lang3 + ${apache.lang3.version} + + + org.apache.commons + commons-text + ${apache.commons-text.version} + @@ -200,29 +300,6 @@ http://www.evosuite.org/m2 - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - - - ecomp-staging - ECOMP Staging Repository - ${nexusproxy}/content/repositories/staging/ - - @@ -376,7 +453,7 @@ true docker-hub - ${docker.push.registry}/onap/${project.artifactId} + ${docker.push.registry}/openecomp/${project.artifactId} ${docker.location} latest @@ -386,31 +463,35 @@ org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - -noverify ${argLine} - - - - org.codehaus.mojo - jaxb2-maven-plugin - 2.2 + maven-dependency-plugin + 2.8 - xjc + copy-agent + process-test-classes - xjc + copy + + + + org.powermock + powermock-module-javaagent + 1.6.2 + ${project.build.directory}/agents + powermock-javaagent.jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 - false - ${project.build.directory}/generated-sources - - ${project.basedir}/src/main/resources/schema - - true + -noverify ${argLine} @@ -477,26 +558,26 @@ sonar-maven-plugin 3.2 - - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 - - true - - - - jacoco-initialize-unit-tests - - prepare-agent - - - ${project.build.directory}/coverage-reports/jacoco.exec - - - - - + + org.jacoco + jacoco-maven-plugin + ${version.jacoco.maven.plugin} + + + jacoco-initialize-unit-tests + + prepare-agent + + + + report + package + + report + + + + org.sonatype.plugins nexus-staging-maven-plugin @@ -511,5 +592,4 @@ - -- cgit 1.2.3-korg