X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=698de2c0ee03ca326fe958a33d86e93fdc1003dc;hb=7c03e5855fb667a01d9375b445c4a04919bd1dbb;hp=636f4222eb91b0ad26806d6f3019dbf65e61fa5e;hpb=92927f8985ae5f381143b8b295df2f466e4349ae;p=aai%2Fgizmo.git diff --git a/pom.xml b/pom.xml index 636f422..698de2c 100644 --- a/pom.xml +++ b/pom.xml @@ -18,38 +18,41 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.oparent oparent - 1.1.0 - + 2.0.0 + org.onap.aai.gizmo gizmo - 1.2.0-SNAPSHOT + 1.6.0-SNAPSHOT aai-gizmo - ${basedir}/target - https://nexus.onap.org - - workstation - DEV - - java - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - false - ${project.version} - 1.3 + 1.4.1 + 1.5.1 + 1.5.3 + 1.5.3 + 1.5.0 + + 0.60 + ${project.build.directory}/code-coverage + + 0.28.0 + 1.0.0 + ${project.build.directory}/${project.artifactId}-build/ + + onap + alpine + 1.6.0 @@ -58,7 +61,7 @@ limitations under the License. org.springframework.boot spring-boot-dependencies - 1.5.12.RELEASE + 1.5.21.RELEASE pom import @@ -69,6 +72,12 @@ limitations under the License. org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + org.springframework.boot @@ -77,63 +86,126 @@ limitations under the License. org.springframework.boot spring-boot-starter + + + ch.qos.logback + logback-classic + + org.springframework.boot spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-starter-tomcat + + org.springframework.boot spring-boot-starter-actuator + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.springframework.boot + spring-boot-starter-test + test + org.apache.cxf cxf-rt-frontend-jaxrs - 3.2.4 + 3.2.5 + + - com.google.guava - guava - 23.0 + io.swagger + swagger-jersey2-jaxrs + 1.5.8 - radeox - radeox - 1.0-b2 + io.springfox + springfox-swagger2 + 2.9.2 - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 + io.springfox + springfox-swagger-ui + 2.9.2 + + + - org.mockito - mockito-all - 1.9.5 - test + org.onap.aai.schema-service + aai-schema + ${version.org.onap.aai.aai-schema} - dom4j - dom4j - 1.6.1 - provided + org.onap.aai.aai-common + aai-schema-ingest + ${version.org.onap.aai.aai-schema-ingest} + + + org.powermock + * + + - commons-io - commons-io - 2.4 + org.onap.aai.aai-common + aai-utils + ${version.org.onap.aai.aai-utils} - org.apache.commons - commons-lang3 - 3.3.1 + org.onap.aai.aai-common + aai-auth + ${version.org.onap.aai.aai-auth} + + - com.google.code.gson - gson - 2.6.2 + org.onap.aai.event-client + event-client-dmaap + ${event.client.version} + + + org.slf4j + slf4j-api + + + + + org.onap.aai.event-client + event-client-kafka + ${event.client.version} + + + org.slf4j + slf4j-api + + + + + + org.onap.aai.event-client + event-client-rabbitmq + ${event.client.version} + + + org.slf4j + slf4j-api + + - + + org.onap.aai.logging-service common-logging @@ -153,52 +225,68 @@ limitations under the License. + + - org.onap.aai.event-client - event-client-dmaap - 1.2.1 + org.onap.aai + rest-client + 1.5.0 + + + + ch.qos.logback + logback-classic + 1.2.3 + + + ch.qos.logback + logback-core + 1.2.3 - org.slf4j - slf4j-api + ch.qos.logback + logback-classic - org.onap.aai.aai-common - aai-schema - 1.2.1 + ch.qos.logback + logback-access + 1.2.3 - org.onap.aai.aai-common - aai-utils - 1.2.1 + com.google.guava + guava - org.onap.aai.aai-common - aai-core - 1.2.1 - - - * - * - - + radeox + radeox + 1.0-b2 - org.onap.aai.aai-common - aai-auth - 1.2.1 + org.codehaus.jackson + jackson-mapper-asl + 1.4.5 - org.eclipse.persistence - eclipselink + commons-io + commons-io + 2.4 + + + org.apache.commons + commons-lang3 + 3.3.1 + + + com.google.code.gson + gson 2.6.2 - org.onap.aai - rest-client - 1.2.1 + org.eclipse.persistence + eclipselink + 2.6.2 net.dongliu @@ -216,7 +304,6 @@ limitations under the License. - org.apache.tinkerpop gremlin-core @@ -248,6 +335,18 @@ limitations under the License. json 20160212 + + org.apache.httpcomponents + httpclient + 4.5.3 + + + org.apache.httpcomponents + httpcore + 4.4.1 + + + junit junit @@ -259,80 +358,152 @@ limitations under the License. test - org.hamcrest - hamcrest-library - ${version.org.hamcrest.hamcrest-library} + org.mockito + mockito-core + 2.15.0 test - - - org.apache.httpcomponents - httpclient - 4.5 - - - org.apache.httpcomponents - httpcore - 4.4.1 - - - org.springframework.boot - - spring-boot-configuration-processor - - true + + + org.hamcrest + hamcrest-library + + + + + + docker + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + 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 + + 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 + + + + + + + + + ${project.artifactId} + - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - - copy-docker-file - package - - copy-resources - - - target - true - - - ${basedir}/src/main/docker - true - - **/* - - - - ${basedir}/src/main/bin/ - - - - - + net.revelc.code.formatter + formatter-maven-plugin + 2.8.1 + + ${project.basedir}/onap-java-formatter.xml + + - - com.spotify - docker-maven-plugin - 0.4.11 + com.diffplug.spotless + spotless-maven-plugin + 1.18.0 - true - docker-hub - ${docker.push.registry}/onap/${project.artifactId} - ${docker.location} - - latest - - true + + + com,java,javax,org + + + - @@ -344,19 +515,21 @@ limitations under the License. src/main/java/** src/test/java/** + pom.xml + true - format + + check process-sources - org.apache.maven.plugins maven-site-plugin @@ -378,55 +551,106 @@ limitations under the License. - org.apache.maven.plugins maven-deploy-plugin - - true - - - org.codehaus.mojo - sonar-maven-plugin - 3.2 + org.springframework.boot + spring-boot-maven-plugin + 2.0.1.RELEASE + + + + repackage + + + - - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 + maven-assembly-plugin - true + + src/main/assembly/descriptor.xml + - jacoco-initialize-unit-tests + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + prepare-package - prepare-agent + unpack - ${project.build.directory}/coverage-reports/jacoco.exec - - + + + org.onap.aai.schema-service + aai-schema + ${version.org.onap.aai.aai-schema} + jar + onap/**/ + ${aai.build.directory}/bundleconfig/etc + + - org.springframework.boot - spring-boot-maven-plugin - 2.0.1.RELEASE + org.jacoco + jacoco-maven-plugin + default-check - repackage + check + + ${jacoco.report.directory}/jacoco-ut.exec + + + + BUNDLE + + + LINE + COVEREDRATIO + ${jacoco.line.coverage.limit} + + + + + - + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + parse-version + + parse-version + + + + +