From: Jimmy Forsyth Date: Fri, 22 Nov 2019 15:22:08 +0000 (-0500) Subject: Change to use aai-parent X-Git-Tag: 1.6.1~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F62%2F98762%2F4;p=aai%2Ftraversal.git Change to use aai-parent Issue-ID: AAI-2724 Signed-off-by: Jimmy Forsyth Change-Id: Iec7303c7056aaa90302150983c4eb712ba617b09 --- diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index 6ed9c8ed..39e7f4d9 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -4,7 +4,7 @@ ============LICENSE_START======================================================= org.onap.aai ================================================================================ - Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + Copyright © 2019 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. @@ -20,1187 +20,1037 @@ ============LICENSE_END========================================================= --> - - 4.0.0 - org.onap.aai.traversal - aai-traversal - 1.6.0-SNAPSHOT + + 4.0.0 + org.onap.aai.traversal + aai-traversal + 1.6.0-SNAPSHOT - - org.onap.aai.traversal - traversal - 1.6.0-SNAPSHOT - + + org.onap.aai.traversal + traversal + 1.6.0-SNAPSHOT + - - 1.8 - org.onap.aai.TraversalApp + + 1.8 + org.onap.aai.TraversalApp - true - 1.8 - 1.8 + true + 1.8 + 1.8 - 1.6.0 - 1.5.3 - 1.5.3 + + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + false + ${project.version} + + + + 3.2.3 + docker.io + + + localhost:5000 + 1.0.0 - 1.5.21.RELEASE + + ${project.build.directory}/${project.artifactId}-${project.version}-build/ + 1.0.0 + onap + alpine + 1.6.0 - - java - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - false - ${project.version} - + + https://nexus.onap.org + /content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version} + /content/repositories/releases/ + /content/repositories/snapshots/ - 0.0.24 - 4.9 + + yyyyMMdd'T'HHmmss'Z' - 1.5.8 - 1.2.17 + true + true - 1.9.2 - 1.10 - 1.9 + ${project.basedir}/snapshots/data.graphson + 0.67 - 1.3.0 - 1.8.20 - 4.5.2 - 1.8.36 - 2.1.4 - 2.6 - 1.0.0 - 1.2.3 - 2.0.0.0 - 2.7.8 - 19.0 - 0.2.3 - 2.1.9 - 3.2.2 - 3.0.4 - 1.1.1 - 1.10.19 - 1.6.2 - 1.48 - 20090211 - 2.3.21 - 2.2.11 - 2.6.2 - 1.9 - 1.2 - 2.7 - 0.2.12 - 4.4 - 2.2.0 - 5.15.8 - 4.5.3 - 4.3.21.RELEASE - 0.4.11 - 1.0.8.RELEASE + + onap + N/A + ${project.basedir}/src/main/resources/schema/${schema.source.name}/oxm + ${project.basedir}/src/main/resources/schema/${schema.source.name}/dbedgerules + v10 + v10 + v11 + v12 + v12 + v16 + v10,v11,v12,v13,v14,v15,v16,v17,v18,v19 + /aai + + + + + + docker + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + pre-clean + + + parse-base + prepare-package + + execute + + + + def userAaiBaseImage = session.userProperties['aai.base.image']; + def userAaiCommonVersion = + session.userProperties['aai.base.image.version']; + if (userAaiCommonVersion != null) { + project.properties['aai.base.image.version'] = + userAaiCommonVersion; + } + if (userAaiBaseImage != null) { + project.properties['aai.base.image'] = userAaiBaseImage; + } + log.info 'Base image flavour: ' + + project.properties['aai.base.image']; + log.info 'Base image version: ' + + project.properties['aai.base.image.version']; + + + + + + + io.fabric8 + docker-maven-plugin + + true + 1.23 + + + ${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l + + @ + + latest + ${project.docker.latesttag.version} + ${project.major.version}.${project.minor.version}-STAGING-${maven.build.timestamp} + + try + ${project.basedir}/src/main/docker + + + + + ${aai.build.directory} + /${project.artifactId} + + + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + generate-images + package + + build + + + + push-images + deploy + + push + + + + + + + + + + onap + + onap + v12 + v10,v11,v12,v13,v14,v15,v16 + + + + + runAjsc + + ${maven.skip.tests} + + + pre-integration-test + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + run-spring-boot + package + + java + + + + + ${start-class} + + + snapshot.location + ${snapshot.file} + + + schema.source.name + ${schema.source.name} + + + schema.configuration.location + ${schema.configuration.location} + + + schema.nodes.location + ${schema.nodes.location} + + + schema.edges.location + ${schema.edges.location} + + + schema.version.depth.start + ${schema.version.depth.start} + + + schema.version.related.link.start + ${schema.version.related.link.start} + + + schema.version.app.root.start + ${schema.version.app.root.start} + + + schema.version.namespace.change.start + ${schema.version.namespace.change.start} + + + schema.version.edge.label.start + ${schema.version.edge.label.start} + + + schema.version.api.default + ${schema.version.api.default} + + + schema.version.list + ${schema.version.list} + + + schema.uri.base.path + ${schema.uri.base.path} + + + java + + + + + + - 2.8.5 - 0.0.7 - 1.4.0 + + + + io.swagger + swagger-core + + + javax.ws.rs + jsr311-api + + + + + io.swagger + swagger-annotations + + + io.swagger + swagger-jersey-jaxrs + + + org.glassfish.jersey.media + jersey-media-multipart + + + jersey-core + com.sun.jersey + + + jersey-json + com.sun.jersey + + + jersey-server + com.sun.jersey + + + jersey-client + com.sun.jersey + + + jsr311-api + javax.ws.rs + + + jersey-multipart + com.sun.jersey.contribs + + + + + commons-configuration + commons-configuration + + + commons-lang + commons-lang + + + + + commons-lang + commons-lang + + + + com.att.eelf + eelf-core + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + ch.qos.logback + logback-access + + + org.hamcrest + hamcrest-junit + + + junit + junit + test + + + com.google.guava + guava + + + org.janusgraph + janusgraph-core + + + org.slf4j + slf4j-log4j12 + + + dom4j + dom4j + + + + + org.janusgraph + janusgraph-cassandra + + + org.slf4j + slf4j-log4j12 + + + + + org.janusgraph + janusgraph-cql + + + org.slf4j + slf4j-log4j12 + + + + + + + com.github.jnr + jnr-ffi + + + org.apache.tinkerpop + gremlin-driver + + + org.codehaus.groovy + groovy + + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + org.mockito + mockito-all + test + + + org.powermock + powermock-module-junit4 + test + + + org.powermock + powermock-api-mockito + test + + + com.beust + jcommander + + + org.json + json + + + org.freemarker + freemarker + + + javax.xml.bind + jaxb-api + + + org.eclipse.persistence + eclipselink + + + org.eclipse.persistence + org.eclipse.persistence.moxy + compile + + + org.powermock + powermock-module-javaagent + test + + + org.powermock + powermock-module-junit4-rule-agent + test + + + com.github.fge + json-patch + + + org.javatuples + javatuples + compile + + + com.google.code.gson + gson + + + com.bazaarvoice.jolt + jolt-complete + + + com.jayway.jsonpath + json-path + + + + org.apache.activemq + activemq-broker + + + org.apache.activemq + activemq-client + + + org.onap.aai.aai-common + aai-core + + + com.sun.jersey + jersey-core + + + org.codehaus.jackson + jackson-mapper-asl + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-server + + + org.springframework + spring-web + + + + + org.springframework + spring-jms + + + com.sun.jersey + jersey-core + + + + + + + org.apache.httpcomponents + httpclient + + + org.onap.aai.aai-common + aai-rest + + + org.skyscreamer + jsonassert + test + + + + org.springframework.security + spring-security-rsa + + + org.bouncycastle + bcpkix-jdk15on + + + + + io.netty + netty-handler + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + org.slf4j + log4j-over-slf4j + + + + + org.springframework.boot + spring-boot-starter-jetty + + + org.springframework.boot + spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.onap.aaf.authz + aaf-cadi-aaf + + + io.netty + netty-all + + + org.springframework + spring-test + test + + + org.springframework.boot + spring-boot-test + test + + + org.antlr + antlr4-runtime + + + org.antlr + antlr4-maven-plugin + ${antlr.version} + + + org.sonatype.sisu + sisu-guava + + + + + org.apache.tinkerpop + gremlin-core + + + org.slf4j + slf4j-log4j12 + + + + + org.apache.tinkerpop + tinkergraph-gremlin + + + org.apache.tinkerpop + gremlin-groovy + + + org.codehaus.plexus + plexus-utils + + + + + + ${project.basedir}/src/main/swm + ${project.build.directory}/swm + false + + + ${project.basedir}/src/main/resources + + application.properties + dme2.properties + logback.xml + localhost-access-logback.xml + + ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig + false + + + ${project.basedir}/src/main/resources + + **/* + + true + + + ${project.basedir}/src/main/resources/etc/appprops/ + + janusgraph-realtime.properties + janusgraph-cached.properties + aaiconfig.properties + + ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig + false + + + ${project.basedir}/src/main/resources/etc/auth/ + + aai-client-cert.p12 + tomcat_keystore + aai_policy.json + + ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig + true + + + ${project.basedir}/src/main/resources/ + + logback.xml + localhost-access-logback.xml + + ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig + true + + + ${project.basedir}/src/main/resources/schema/ + + **/oxm/**/*.xml + **/dbedgerules/**/*.json + **/query/** + + ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig/schema + false + + + ${project.basedir}/src/main/resources/query/ + + **/*.json + + ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig/query + false + + + ${project.basedir}/src/main/docker + + **/* + + ${aai.build.directory} + true + + + + + + com.mycila + license-maven-plugin + 3.0 + +
LICENSE.TXT
+ + src/main/java/** + src/test/java/** + pom.xml + + true + false +
+
+ + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + + println project.properties['aai.project.version']; + def versionArray; + if (project.properties['aai.project.version'] != null) { + versionArray = + project.properties['aai.project.version'].split('\\.'); + } - 9.4.1.v20170120 - - 0.28.0 - - docker.io - - - localhost:5000 - 1.0.0 - - - ${project.build.directory}/${project.artifactId}-${project.version}-build/ - 1.0.0 - onap - alpine - 1.6.0 - - - https://nexus.onap.org - /content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version} - /content/repositories/releases/ - /content/repositories/snapshots/ - - 4.1.9.Final - 4.0.56.Final - 2.8.11.1 - - 4.3.21.RELEASE - - - yyyyMMdd'T'HHmmss'Z' - - true - true - 4.7 - - 3.1.0 - - ${project.basedir}/snapshots/data.graphson - 0.67 - - - onap - N/A - ${project.basedir}/src/main/resources/schema/${schema.source.name}/oxm - ${project.basedir}/src/main/resources/schema/${schema.source.name}/dbedgerules - v10 - v10 - v11 - v12 - v12 - v16 - v10,v11,v12,v13,v14,v15,v16,v17,v18,v19 - /aai - -
- - - - docker - - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - pre-clean - - - parse-base - prepare-package - - execute - - - - def userAaiBaseImage = session.userProperties['aai.base.image']; - def userAaiCommonVersion = session.userProperties['aai.base.image.version']; - if (userAaiCommonVersion != null) { - project.properties['aai.base.image.version'] = userAaiCommonVersion; - } - if (userAaiBaseImage != null) { - project.properties['aai.base.image'] = userAaiBaseImage; - } - log.info 'Base image flavour: ' + project.properties['aai.base.image']; - log.info 'Base image version: ' + project.properties['aai.base.image.version']; - - - - - - - io.fabric8 - docker-maven-plugin - ${docker.fabric.version} - - true - 1.23 - - - ${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l - - @ - - latest - ${project.docker.latesttag.version} - ${project.major.version}.${project.minor.version}-STAGING-${maven.build.timestamp} - - try - ${project.basedir}/src/main/docker - - - - - ${aai.build.directory} - /${project.artifactId} - - - - - - - - - - - clean-images - pre-clean - - remove - - - true - - - - generate-images - package - - build - - - - push-images - deploy - - push - - - - - - - - - - onap - - onap - v12 - v10,v11,v12,v13,v14,v15,v16 - - - - - runAjsc - - ${maven.skip.tests} - - - pre-integration-test - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - run-spring-boot - package - - java - - - - - ${start-class} - - - snapshot.location - ${snapshot.file} - - - schema.source.name - ${schema.source.name} - - - schema.configuration.location - ${schema.configuration.location} - - - schema.nodes.location - ${schema.nodes.location} - - - schema.edges.location - ${schema.edges.location} - - - schema.version.depth.start - ${schema.version.depth.start} - - - schema.version.related.link.start - ${schema.version.related.link.start} - - - schema.version.app.root.start - ${schema.version.app.root.start} - - - schema.version.namespace.change.start - ${schema.version.namespace.change.start} - - - schema.version.edge.label.start - ${schema.version.edge.label.start} - - - schema.version.api.default - ${schema.version.api.default} - - - schema.version.list - ${schema.version.list} - - - schema.uri.base.path - ${schema.uri.base.path} - - - java - - - - - - - - - - org.springframework.boot - spring-boot-starter-parent - ${spring.boot.version} - pom - import - - - - - - net.sf.jopt-simple - jopt-simple - ${jopt.simple.version} - - - io.swagger - swagger-core - ${io.swagger.version} - - - javax.ws.rs - jsr311-api - - - - - io.swagger - swagger-annotations - ${io.swagger.version} - - - io.swagger - swagger-jersey-jaxrs - ${io.swagger.version} - - - org.glassfish.jersey.media - jersey-media-multipart - - - jersey-core - com.sun.jersey - - - jersey-json - com.sun.jersey - - - jersey-server - com.sun.jersey - - - jersey-client - com.sun.jersey - - - jsr311-api - javax.ws.rs - - - jersey-multipart - com.sun.jersey.contribs - - - - - commons-configuration - commons-configuration - ${commons.configuration.version} - - - commons-lang - commons-lang - - - - - 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 - test - - - com.google.guava - guava - ${google.guava.version} - - - org.janusgraph - janusgraph-core - ${janusgraph.version} - - - org.slf4j - slf4j-log4j12 - - - dom4j - dom4j - - - - - org.janusgraph - janusgraph-cassandra - ${janusgraph.version} - - - org.slf4j - slf4j-log4j12 - - - - - org.janusgraph - janusgraph-cql - ${janusgraph.version} - - - org.slf4j - slf4j-log4j12 - - - - - org.janusgraph - janusgraph-hbase - ${janusgraph.version} - - - dom4j - dom4j - - - - - - com.github.jnr - jnr-ffi - ${jnr.ffi.version} - - - org.apache.tinkerpop - gremlin-driver - ${gremlin.version} - - - org.codehaus.groovy - groovy - - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - org.mockito - mockito-all - ${mockito.version} - test - - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - org.powermock - powermock-api-mockito - ${powermock.version} - test - - - com.beust - jcommander - ${jcommander.version} - - - org.json - json - ${json.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - javax.xml.bind - jaxb-api - ${jaxb.version} - - - com.sun.xml.bind - jaxb-impl - ${jaxb.version} - - - com.sun.xml.bind - jaxb-core - ${jaxb.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} - compile - - - org.powermock - powermock-module-javaagent - ${powermock.version} - test - - - org.powermock - powermock-module-junit4-rule-agent - ${powermock.version} - test - - - com.github.fge - json-patch - ${json.patch.version} - - - org.javatuples - javatuples - ${javatuples.version} - compile - - - com.google.code.gson - gson - ${gson.version} - - - com.bazaarvoice.jolt - jolt-complete - ${jolt.version} - - - com.jayway.jsonpath - json-path - ${json.path.version} - - - - org.apache.activemq - activemq-broker - ${activemq.version} - - - org.apache.activemq - activemq-client - ${activemq.version} - - - org.onap.aai.aai-common - aai-core - ${aai.core.version} - - - com.sun.jersey - jersey-core - - - org.codehaus.jackson - jackson-mapper-asl - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-server - - - org.springframework - spring-web - - - - - org.springframework - spring-jms - ${spring.jms.version} - - - com.sun.jersey - jersey-core - - - - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - org.onap.aai.aai-common - aai-rest - ${aai.rest.version} - - - org.skyscreamer - jsonassert - ${jsonassert.version} - test - - - - org.springframework.security - spring-security-rsa - ${spring.security.version} - - - org.bouncycastle - bcpkix-jdk15on - - - - - io.netty - netty-handler - ${netty.handler.version} - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - org.slf4j - log4j-over-slf4j - - - - - org.springframework.boot - spring-boot-starter-jetty - - - org.springframework.boot - spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.onap.aaf.authz - aaf-cadi-aaf - ${aaf.version} - - - io.netty - netty-all - ${netty.version} - - - org.springframework - spring-test - ${spring.test.version} - test - - - org.springframework.boot - spring-boot-test - test - - - org.antlr - antlr4-runtime - ${antlr.version} - - - org.antlr - antlr4-maven-plugin - ${antlr.version} - - - org.sonatype.sisu - sisu-guava - - - - - org.apache.tinkerpop - gremlin-core - ${gremlin.version} - - - org.slf4j - slf4j-log4j12 - - - - - org.apache.tinkerpop - tinkergraph-gremlin - ${gremlin.version} - - - org.apache.tinkerpop - gremlin-groovy - ${gremlin.version} - - - org.codehaus.plexus - plexus-utils - ${plexus.utils.version} - - - - - - ${project.basedir}/src/main/swm - ${project.build.directory}/swm - false - - - ${project.basedir}/src/main/resources - - application.properties - dme2.properties - logback.xml - localhost-access-logback.xml - - ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig - false - - - ${project.basedir}/src/main/resources - - **/* - - true - - - ${project.basedir}/src/main/resources/etc/appprops/ - - janusgraph-realtime.properties - janusgraph-cached.properties - aaiconfig.properties - - ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig - false - - - ${project.basedir}/src/main/resources/etc/auth/ - - aai-client-cert.p12 - tomcat_keystore - aai_policy.json - - ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig - true - - - ${project.basedir}/src/main/resources/ - - logback.xml - localhost-access-logback.xml - - ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig - true - - - ${project.basedir}/src/main/resources/schema/ - - **/oxm/**/*.xml - **/dbedgerules/**/*.json - **/query/** - - ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig/schema - false - - - ${project.basedir}/src/main/resources/query/ - - **/*.json - - ${project.build.directory}/swm/package/nix/dist_files/opt/app/${project.artifactId}/appconfig/query - false - - - ${project.basedir}/src/main/docker - - **/* - - ${aai.build.directory} - true - - - - - - com.mycila - license-maven-plugin - 3.0 - -
LICENSE.TXT
- - src/main/java/** - src/test/java/** - pom.xml - - true - false -
-
- - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - validate - - execute - - - - println project.properties['aai.project.version']; - def versionArray; - if (project.properties['aai.project.version'] != null) { - versionArray = project.properties['aai.project.version'].split('\\.'); - } - - project.properties["project.major.version"] = versionArray[0]; - project.properties["project.minor.version"] = versionArray[1]; - project.properties['project.docker.latesttag.version'] = versionArray[0] + '.' + versionArray[1] + '-STAGING-latest'; - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - - - - - -
-
- - - org.apache.maven.plugins - maven-clean-plugin - 2.4.1 - - - - ${project.basedir}/src/main/resources/etc/oxm - - **/* - - false - - - ${project.basedir}/src/main/resources/etc/dbedgerules - - **/* - - false - - - ${project.basedir}/src/main/resources/schema - - **/oxm/** - **/dbedgerules/** - - false - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - exec-maven-plugin - org.codehaus.mojo - - - org.apache.maven.plugins - maven-javadoc-plugin - - - com.mycila - license-maven-plugin - - - maven-assembly-plugin - - - src/main/assembly/descriptor.xml - - - - - make-assembly - package - - single - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - -noverify ${argLine} - alphabetical - - - - org.codehaus.mojo - sonar-maven-plugin - 3.3 - - - org.codehaus.groovy.maven - gmaven-plugin - - - org.jacoco - jacoco-maven-plugin - 0.7.9 - - true - - **/**/models/**/*.class - - - - - 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.springframework.boot - spring-boot-maven-plugin - - ${start-class} - ZIP - - - - - repackage - - - - - - org.antlr - antlr4-maven-plugin - 4.7 - - - - antlr4 - - - src/main/resources/antlr4 - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - unpack-schema-dependency - initialize - - unpack - - - - - org.onap.aai.schema-service - aai-schema - ${aai.schema.version} - ${project.basedir}/src/main/resources/schema/ - **/oxm/**/*.xml - - - - - - - unpack-edgerules-dependency - initialize - - unpack - - - - - org.onap.aai.schema-service - aai-schema - ${aai.schema.version} - ${project.basedir}/src/main/resources/schema/ - **/dbedgerules/**/*.json - - - - - - - - - com.mycila - license-maven-plugin - 3.0 - -
LICENSE.TXT
- - src/main/java/** - src/test/java/** - pom.xml - - false - false -
-
-
-
+ project.properties["project.major.version"] = versionArray[0]; + project.properties["project.minor.version"] = versionArray[1]; + project.properties['project.docker.latesttag.version'] = + versionArray[0] + '.' + versionArray[1] + '-STAGING-latest'; + println 'New Tag for docker:' + + project.properties['project.docker.latesttag.version']; + + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 2.4.1 + + + + ${project.basedir}/src/main/resources/etc/oxm + + **/* + + false + + + ${project.basedir}/src/main/resources/etc/dbedgerules + + **/* + + false + + + ${project.basedir}/src/main/resources/schema + + **/oxm/** + **/dbedgerules/** + + false + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + exec-maven-plugin + org.codehaus.mojo + + + org.apache.maven.plugins + maven-javadoc-plugin + + + com.mycila + license-maven-plugin + + + maven-assembly-plugin + + + src/main/assembly/descriptor.xml + + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 + + -noverify ${argLine} + alphabetical + + + + org.codehaus.mojo + sonar-maven-plugin + 3.3 + + + org.codehaus.groovy.maven + gmaven-plugin + + + org.jacoco + jacoco-maven-plugin + 0.7.9 + + true + + **/**/models/**/*.class + + + + + 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.springframework.boot + spring-boot-maven-plugin + + ${start-class} + ZIP + + + + + repackage + + + + + + org.antlr + antlr4-maven-plugin + 4.7 + + + + antlr4 + + + src/main/resources/antlr4 + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + unpack-schema-dependency + initialize + + unpack + + + + + org.onap.aai.schema-service + aai-schema + ${project.basedir}/src/main/resources/schema/ + **/oxm/**/*.xml + + + + + + + unpack-edgerules-dependency + initialize + + unpack + + + + + org.onap.aai.schema-service + aai-schema + ${project.basedir}/src/main/resources/schema/ + **/dbedgerules/**/*.json + + + + + + + + + com.mycila + license-maven-plugin + 3.0 + +
LICENSE.TXT
+ + src/main/java/** + src/test/java/** + pom.xml + + false + false +
+
+
+
diff --git a/aai-traversal/src/main/java/org/onap/aai/transforms/MapTraverser.java b/aai-traversal/src/main/java/org/onap/aai/transforms/MapTraverser.java index 9091998b..36c453a7 100644 --- a/aai-traversal/src/main/java/org/onap/aai/transforms/MapTraverser.java +++ b/aai-traversal/src/main/java/org/onap/aai/transforms/MapTraverser.java @@ -19,14 +19,13 @@ */ package org.onap.aai.transforms; - -import joptsimple.internal.Objects; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.collections.MapUtils; + public class MapTraverser { private Converter converter; @@ -37,8 +36,9 @@ public class MapTraverser { public Map convertKeys(Map map){ - Objects.ensureNotNull(map); - + if (MapUtils.isEmpty(map)) { + throw new NullPointerException("map cannot be null"); + } Map modifiedMap = new HashMap(); convertKeys(map, modifiedMap); diff --git a/pom.xml b/pom.xml index c1278d12..d0233fca 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,32 @@ + 4.0.0 - org.onap.oparent - oparent - 2.0.0 + org.onap.aai.aai-common + aai-parent + 1.6.1-SNAPSHOT org.onap.aai.traversal traversal