From a5d4adc4185af54a19de5de748c728875511c790 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 5 Nov 2019 17:25:27 -0500 Subject: [PATCH] Add parent and update modules to use it Issue-ID: AAI-2699 Signed-off-by: Jimmy Forsyth Change-Id: I288cb51a4f654387d6ca078f7b4357e8ce2e43c5 --- aai-annotations/pom.xml | 5 +- aai-auth/pom.xml | 7 +- aai-common-docker/pom.xml | 4 +- aai-core/pom.xml | 1004 +++++++++++++++++++--------------------- aai-parent/pom.xml | 416 +++++++++++++++++ aai-rest/pom.xml | 22 +- aai-schema-abstraction/pom.xml | 17 +- aai-schema-ingest/pom.xml | 368 +++++++-------- aai-utils/pom.xml | 15 +- pom.xml | 17 +- 10 files changed, 1082 insertions(+), 793 deletions(-) create mode 100644 aai-parent/pom.xml diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index 8838d532..270374b5 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -26,13 +26,13 @@ 4.0.0 org.onap.aai.aai-common - aai-common + aai-parent 1.6.0-SNAPSHOT + ../aai-parent/pom.xml aai-annotations aai-annotations jar - 1.6.0-SNAPSHOT https://nexus.onap.org @@ -40,7 +40,6 @@ junit junit - 3.8.1 test diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml index 090a7bcd..8fe575b7 100644 --- a/aai-auth/pom.xml +++ b/aai-auth/pom.xml @@ -1,3 +1,4 @@ + - 4.0.0 - - org.onap.aai.aai-common - aai-common - 1.6.0-SNAPSHOT - - aai-core - aai-core - 1.6.0-SNAPSHOT - jar - - 4.3.24.RELEASE - java - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - false - ${project.version} - 4.5.5 - 2.2.3 - 1.0.1-oss - 1.2.3 - 2.3.21 - 5.15.6 - 0.50 - 3.2.2 - 2.4.15 - 9.4.11.v20180605 - - - https://wiki.onap.org/ - v15 - onap - /aai - N/A - aai-schema/src/main/resources/${aai.release}/oxm - aai-schema/src/main/resources/${aai.release}/dbedgerules - v10 - v10 - v11 - v12 - v12 - v15 - v10,v11,v12,v13,v14,v15 - config - - - - - - onap - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + org.onap.aai.aai-common + aai-parent + 1.6.0-SNAPSHOT + ../aai-parent/pom.xml + + aai-core + aai-core + jar + 4.3.24.RELEASE - onap - N/A - aai-schema/src/main/resources/${aai.release}/oxm - aai-schema/src/main/resources/${aai.release}/dbedgerules - v10 - v10 - v11 - v12 - v12 - v15 - v10,v11,v12,v13,v14,v15 - v15 - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - -noverify ${argLine} - - . - bundleconfig-local - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - org.codehaus.mojo - 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 - - - - - post-unit-test - test - - report - - - - ${project.build.directory}/coverage-reports/jacoco.exec - - ${project.reporting.outputDirectory}/jacoco - - - - default-check - - check - - - ${project.build.directory}/coverage-reports/jacoco.exec - - - BUNDLE - - - LINE - COVEREDRATIO - ${jacoco.line.coverage.limit} - - - - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - - org.apache.maven.plugins - maven-site-plugin - - - + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + false + ${project.version} + 4.5.5 + 2.2.3 + 1.0.1-oss + 1.2.3 + 2.3.21 + 5.15.6 + 0.50 + 3.2.2 + 2.4.15 + 9.4.11.v20180605 + + + https://wiki.onap.org/ + v15 + onap + /aai + N/A + aai-schema/src/main/resources/${aai.release}/oxm + aai-schema/src/main/resources/${aai.release}/dbedgerules + v10 + v10 + v11 + v12 + v12 + v15 + v10,v11,v12,v13,v14,v15 + config + + + + + + onap + + 4.3.24.RELEASE + onap + N/A + aai-schema/src/main/resources/${aai.release}/oxm + aai-schema/src/main/resources/${aai.release}/dbedgerules + v10 + v10 + v11 + v12 + v12 + v15 + v10,v11,v12,v13,v14,v15 + v15 + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 + + -noverify ${argLine} + + . + bundleconfig-local + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + org.codehaus.mojo + 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 + + + + + post-unit-test + test + + report + + + + ${project.build.directory}/coverage-reports/jacoco.exec + + ${project.reporting.outputDirectory}/jacoco + + + + default-check + + check + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + BUNDLE + + + LINE + COVEREDRATIO + ${jacoco.line.coverage.limit} + + + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + org.apache.maven.plugins + maven-site-plugin + + + + + + + org.onap.aai.aai-common + aai-schema-ingest + + + org.onap.aai.aai-common + aai-annotations + + + commons-lang + commons-lang + + + org.apache.commons + commons-text + compile + + + com.att.eelf + eelf-core + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + junit + junit + test + + + org.hamcrest + hamcrest-junit + test + + + org.hamcrest + hamcrest-core + test + + + org.mockito + mockito-all + test + + + org.powermock + powermock-module-junit4 + test + + + org.powermock + powermock-api-mockito + test + + + com.google.guava + guava + + + org.janusgraph + janusgraph-core + + + org.slf4j + slf4j-log4j12 + + + dom4j + dom4j + + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.googlecode.json-simple + json-simple + + + javax.xml.bind + jaxb-api + + + org.eclipse.persistence + eclipselink + + + com.google.code.gson + gson + + + com.jayway.jsonpath + json-path + + + org.eclipse.jetty + jetty-util + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-json + + + javax.ws.rs + javax.ws.rs-api + + + org.apache.tinkerpop + gremlin-core + + + org.apache.tinkerpop + tinkergraph-gremlin + + + org.slf4j + slf4j-api + + + com.fasterxml.jackson.core + jackson-annotations + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + xml-apis + xml-apis + + + commons-cli + commons-cli + + + com.beust + jcommander + + + org.json + json - - - org.onap.aai.aai-common - aai-schema-ingest - ${project.version} - - - org.onap.aai.aai-common - aai-annotations - ${project.version} - - - commons-lang - commons-lang - 2.6 - - - org.apache.commons - commons-text - 1.1 - compile - - - com.att.eelf - eelf-core - ${eelf.core.version} - - - org.codehaus.jackson - jackson-core-asl - 1.9.13 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - - - junit - junit - 4.12 - test - - - org.hamcrest - hamcrest-junit - 2.0.0.0 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.mockito - mockito-all - 1.10.19 - test - - - org.powermock - powermock-module-junit4 - 1.6.2 - test - - - org.powermock - powermock-api-mockito - 1.6.2 - test - - - com.google.guava - guava - 19.0 - - - org.janusgraph - janusgraph-core - 0.2.3 - - - org.slf4j - slf4j-log4j12 - - - dom4j - dom4j - - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson.version} - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - javax.xml.bind - jaxb-api - 2.2.11 - - - org.eclipse.persistence - eclipselink - 2.6.2 - - - com.google.code.gson - gson - 2.7 - - - com.jayway.jsonpath - json-path - 2.2.0 - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} - - - com.sun.jersey - jersey-core - 1.18 - - - com.sun.jersey - jersey-client - 1.18 - - - com.sun.jersey - jersey-json - 1.18 - - - javax.ws.rs - javax.ws.rs-api - 2.0.1 - - - org.apache.tinkerpop - gremlin-core - ${gremlin.version} - - - org.apache.tinkerpop - tinkergraph-gremlin - ${gremlin.version} - - - org.slf4j - slf4j-api - 1.7.5 - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - - - xml-apis - xml-apis - 1.0.b2 - - - commons-cli - commons-cli - 1.3 - - - com.beust - jcommander - 1.48 - - - org.json - json - 20160810 - - - javax.servlet - javax.servlet-api - 3.1.0 - - - com.bazaarvoice.jolt - jolt-complete - 0.0.24 - - - ch.qos.logback - logback-core - ${logback.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-access - ${logback.version} - - - org.apache.activemq - activemq-broker - ${activemq.version} - - - com.opencsv - opencsv - 3.1 - - - org.freemarker - freemarker - ${freemarker.version} - - - com.github.fge - json-patch - 1.9 - - - org.codehaus.groovy - groovy - ${groovy.version} - indy - - - org.springframework - spring-context - ${springframework.version} - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-core - ${springframework.version} - - - org.springframework - spring-expression - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - org.springframework - spring-test - ${springframework.version} - test - - - org.springframework.boot - spring-boot-test - 1.5.21.RELEASE - test - - - org.powermock - powermock-module-javaagent - 1.6.2 - test - - - org.skyscreamer - jsonassert - 1.4.0 - test - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - org.apache.tinkerpop - gremlin-groovy - ${gremlin.version} - - - org.codehaus.groovy - groovy - - - - - org.springframework - spring-jms - ${springframework.version} - - - com.fasterxml.jackson.core - jackson-core - 2.8.11 - - - com.fasterxml.jackson.core - jackson-databind - 2.8.11 - - - com.fasterxml.jackson.core - jackson-annotations - 2.8.11 - - - log4j - log4j - 1.2.17 - - + + + javax.servlet + javax.servlet-api + + + com.bazaarvoice.jolt + jolt-complete + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + ch.qos.logback + logback-access + + + org.apache.activemq + activemq-broker + + + com.opencsv + opencsv + + + org.freemarker + freemarker + + + com.github.fge + json-patch + + + org.codehaus.groovy + groovy + indy + + + org.springframework + spring-context + + + org.springframework + spring-web + + + org.springframework + spring-core + + + org.springframework + spring-expression + + + org.springframework + spring-webmvc + + + org.springframework + spring-test + test + + + org.springframework.boot + spring-boot-test + test + + + org.powermock + powermock-module-javaagent + test + + + org.skyscreamer + jsonassert + test + + + org.apache.httpcomponents + httpclient + + + org.apache.tinkerpop + gremlin-groovy + + + org.codehaus.groovy + groovy + + + + + org.springframework + spring-jms + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + log4j + log4j + + - - - - central - http://repo1.maven.org/maven2 - - - EvoSuite - EvoSuite Repository - http://www.evosuite.org/m2 - - + + + + central + http://repo1.maven.org/maven2 + + + EvoSuite + EvoSuite Repository + http://www.evosuite.org/m2 + + - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -views - true - - - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + + + + diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml new file mode 100644 index 00000000..edd60484 --- /dev/null +++ b/aai-parent/pom.xml @@ -0,0 +1,416 @@ + + + + 4.0.0 + + org.onap.aai.aai-common + aai-common + 1.6.0-SNAPSHOT + + aai-parent + aai-parent + pom + + + + + + + + 2.1.15 + 1.9.13 + 1.9.4 + 1.4 + 1.10 + 2.6 + 2.6 + 1.8 + 0.31.0 + 2.6.8 + 1.0.1-oss + 2.3.29 + 19.0 + 3.2.11 + 2.4.17 + 2.8.6 + 2.0.0.0 + 0.2.3 + 1.2 + 2.2.12 + 2.0.1 + 1.78 + 1.19.4 + 2.1.11 + 0.0.24 + 1.9 + 20190722 + 4.12 + 1.2.3 + 1.2.17 + 1.10.19 + 2.15.0 + 3.1 + 1.6.6 + 1.5.22.RELEASE + 4.3.25.RELEASE + 1.0.8.RELEASE + 1.5.1 + 1.5.1 + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + org.springframework.boot + spring-boot-test + test + ${spring.boot.version} + + + + commons-configuration + commons-configuration + ${commons.configuration.version} + + + + commons-lang + commons-lang + ${commons.lang.version} + + + + com.att.eelf + eelf-core + ${eelf.core.version} + + + + ch.qos.logback + logback-core + ${logback.version} + + + + ch.qos.logback + logback-classic + ${logback.version} + + + + ch.qos.logback + logback-access + ${logback.version} + + + + org.hamcrest + hamcrest-junit + ${hamcrest.junit.version} + + + + junit + junit + ${junit.version} + + + + com.google.guava + guava + ${google.guava.version} + + + + org.janusgraph + janusgraph-core + ${janusgraph.version} + + + + org.janusgraph + janusgraph-cassandra + ${janusgraph.version} + + + + org.janusgraph + janusgraph-cql + ${janusgraph.version} + + + + com.github.jnr + jnr-ffi + ${jnr.ffi.version} + + + + org.apache.tinkerpop + tinkergraph-gremlin + ${gremlin.version} + + + org.apache.tinkerpop + gremlin-core + ${gremlin.version} + + + org.apache.tinkerpop + gremlin-driver + ${gremlin.version} + + + + org.apache.tinkerpop + gremlin-groovy + ${gremlin.version} + + + + org.codehaus.groovy + groovy + ${groovy.version} + indy + + + + org.mockito + mockito-all + ${mockito.all.version} + + + + + org.powermock + powermock-module-junit4 + ${powermock.version} + + + + org.powermock + powermock-api-mockito + ${powermock.version} + + + org.powermock + powermock-module-javaagent + ${powermock.version} + + + com.beust + jcommander + ${jcommander.version} + + + + org.json + json + ${json.version} + + + + org.freemarker + freemarker + ${freemarker.version} + + + + javax.xml.bind + jaxb-api + ${jaxb.version} + + + + org.onap.aaf.authz + aaf-cadi-aaf + ${aaf.version} + + + + com.sun.xml.bind + jaxb-xjc + ${jaxb.version} + + + + org.eclipse.persistence + eclipselink + ${eclipse.persistence.version} + + + + org.eclipse.persistence + org.eclipse.persistence.moxy + ${eclipse.persistence.version} + + + + com.github.fge + json-patch + ${json.patch.version} + + + + org.javatuples + javatuples + ${javatuples.version} + + + + com.google.code.gson + gson + ${gson.version} + + + + org.onap.aai.aai-common + aai-schema-ingest + ${project.version} + + + + org.apache.commons + commons-text + ${commons.text.version} + + + + org.onap.aai.aai-common + aai-annotations + ${project.version} + + + + org.codehaus.jackson + jackson-core-asl + ${codehaus.jackson.version} + + + + com.sun.jersey + jersey-core + ${jersey.version} + + + com.sun.jersey + jersey-client + ${jersey.version} + + + com.sun.jersey + jersey-json + ${jersey.version} + + + + javax.ws.rs + javax.ws.rs-api + ${jaxrs.version} + + + + commons-cli + commons-cli + ${commons.cli.version} + + + + com.bazaarvoice.jolt + jolt-complete + ${jolt.version} + + + + com.opencsv + opencsv + ${opencsv.version} + + + + log4j + log4j + ${log4j.version} + + + + commons-io + commons-io + ${commons.io.version} + + + + org.onap.aai.aai-common + aai-rest + ${project.version} + + + + org.springframework.security + spring-security-rsa + ${spring.security.rsa.version} + + + + org.onap.aai.logging-service + common-logging + ${aai.common.logging.version} + + + + org.onap.aai.logging-service + logging-api + ${aai.common.logging.version} + + + + org.onap.aai + rest-client + ${aai.rest.client.version} + + + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + io.fabric8 + docker-maven-plugin + ${docker.fabric.version} + + + + + + + diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml index 203a89e4..73b41103 100644 --- a/aai-rest/pom.xml +++ b/aai-rest/pom.xml @@ -28,12 +28,12 @@ org.onap.aai.aai-common - aai-common + aai-parent 1.6.0-SNAPSHOT + ../aai-parent/pom.xml aai-rest aai-rest - 1.6.0-SNAPSHOT https://nexus.onap.org @@ -43,28 +43,14 @@ 1.0.8.RELEASE - - - - org.springframework.boot - spring-boot-starter-parent - ${spring.boot.starter.parent.version} - import - pom - - - - com.att.eelf eelf-core - ${eelf.core.version} org.springframework.boot spring-boot-starter-web - ${spring.boot.starter.web.version} org.springframework.boot @@ -87,12 +73,10 @@ javax.ws.rs javax.ws.rs-api - 2.0.1 org.apache.httpcomponents httpclient - 4.5.5 + + 4.0.0 + + org.onap.aai.aai-common + aai-parent + 1.6.0-SNAPSHOT + ../aai-parent/pom.xml + + aai-schema-ingest + aai-schema-ingest + jar - ============LICENSE_START======================================================= - org.onap.aai - ================================================================================ - Copyright © 2017-2018 AT&T Intellectual Property. 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. - You may obtain a copy of the License at + + 1.0.1-oss + 4.5.5 + 4.3.24.RELEASE + + + + + org.apache.maven.plugins + maven-source-plugin + + + + org.apache.maven.plugins + maven-deploy-plugin + + + org.apache.maven.plugins + maven-site-plugin + + + - http://www.apache.org/licenses/LICENSE-2.0 + + + org.eclipse.persistence + eclipselink + + + com.google.guava + guava + + + org.codehaus.groovy + groovy + indy + + + + commons-io + commons-io + + + org.onap.aai.aai-common + aai-rest + + + org.apache.tinkerpop + gremlin-core + + + com.jayway.jsonpath + json-path + + + javax.ws.rs + javax.ws.rs-api + + + org.springframework + spring-context + + + org.springframework + spring-web + + + org.springframework + spring-core + + + org.springframework + spring-expression + + + org.springframework + spring-webmvc + + + org.springframework.boot + spring-boot-starter-web + + + org.apache.httpcomponents + httpclient + + + org.springframework + spring-test + + + org.springframework.boot + spring-boot-test + test + + + junit + junit + test + + + org.mockito + mockito-all + test + + + com.att.eelf + eelf-core + + + com.google.code.gson + gson + + + + + + central + http://repo1.maven.org/maven2 + + + EvoSuite + EvoSuite Repository + http://www.evosuite.org/m2 + + - 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 - - org.onap.aai.aai-common - aai-common - 1.6.0-SNAPSHOT - - aai-schema-ingest - aai-schema-ingest - 1.6.0-SNAPSHOT - jar - - - 1.0.1-oss - 4.5.5 - 4.3.24.RELEASE - - - - - org.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-deploy-plugin - - - org.apache.maven.plugins - maven-site-plugin - - - - - - - org.eclipse.persistence - eclipselink - 2.6.2 - - - com.google.guava - guava - 19.0 - - - org.codehaus.groovy - groovy - 2.4.15 - indy - - - - commons-io - commons-io - 2.6 - - - org.onap.aai.aai-common - aai-rest - ${project.version} - - - org.apache.tinkerpop - gremlin-core - 3.2.2 - - - com.jayway.jsonpath - json-path - 2.2.0 - - - javax.ws.rs - javax.ws.rs-api - 2.0.1 - - - org.springframework - spring-context - ${springframework.version} - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-core - ${springframework.version} - - - org.springframework - spring-expression - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - org.springframework.boot - spring-boot-starter-web - 1.5.21.RELEASE - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - org.springframework - spring-test - ${springframework.version} - - - org.springframework.boot - spring-boot-test - 1.5.21.RELEASE - test - - - junit - junit - 4.12 - test - - - org.mockito - mockito-all - 1.10.19 - test - - - com.att.eelf - eelf-core - ${eelf.core.version} - - - com.google.code.gson - gson - 2.8.5 - - - - - - central - http://repo1.maven.org/maven2 - - - EvoSuite - EvoSuite Repository - http://www.evosuite.org/m2 - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -views - true - - - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + + + + diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index 000c2d6f..5915b5eb 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -28,12 +28,12 @@ org.onap.aai.aai-common - aai-common + aai-parent 1.6.0-SNAPSHOT + ../aai-parent/pom.xml aai-utils aai-utils - 1.6.0-SNAPSHOT https://nexus.onap.org @@ -45,65 +45,54 @@ com.fasterxml.jackson.core jackson-databind - 2.8.7 org.apache.httpcomponents httpclient - 4.5.3 org.eclipse.persistence eclipselink - 2.6.2 org.onap.aai.logging-service common-logging - 1.1.0 org.springframework spring-core - 4.3.21.RELEASE com.fasterxml.jackson.core jackson-core - 2.8.11 com.fasterxml.jackson.core jackson-databind - 2.8.11 junit junit - 4.11 test ch.qos.logback logback-core - ${logback.version} ch.qos.logback logback-classic - ${logback.version} ch.qos.logback logback-access - ${logback.version} diff --git a/pom.xml b/pom.xml index 2eacb796..4d007e0e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.onap.oparent oparent - 2.0.0 + 2.1.0 org.onap.aai.aai-common @@ -36,13 +36,14 @@ Contains all of the common code for resources and traversal repos - aai-rest - aai-schema-ingest - aai-annotations - aai-core - aai-auth - aai-utils - aai-schema-abstraction + aai-parent + aai-rest + aai-schema-ingest + aai-annotations + aai-core + aai-auth + aai-utils + aai-schema-abstraction -- 2.16.6