X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=51681415458017f436c115b908470ee7844eec09;hb=refs%2Fheads%2Fdublin;hp=9d1bcc5ca4fdeca81f4f8fc6b25578e76f874adc;hpb=bbff9f603c3239cd0ad129937e7410a94adf57fa;p=so.git diff --git a/pom.xml b/pom.xml index 9d1bcc5ca4..5168141545 100644 --- a/pom.xml +++ b/pom.xml @@ -1,36 +1,39 @@ + 4.0.0 org.onap.oparent oparent - 1.1.0 + 1.2.1 org.onap.so so pom - 1.2.0-SNAPSHOT + 1.4.0-SNAPSHOT so This Maven project is responsible to build and package all child projects - contributions in the MSO project. This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB. "mvn clean install -P with-integration-tests -Dintegration-tests-user=root -Dintegration-tests-group=root -Dintegration-tests-db-type=MYSQL" - OPENECOMP - MSO + ONAP - SO http://www.onap.org/ + deployment-configs common - cloudify-client - mso-api-handlers mso-catalog-db + mso-api-handlers adapters asdc-controller - status-control bpmn + cloudify-client + cxf-logging + so-monitoring + vnfm-simulator packages - aria . @@ -39,32 +42,47 @@ java jacoco ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - ${project.mso.base.folder}/packages/arquillian-unit-tests/target/mso-automated-tests/jacoco-it.exec + ${project.build.directory}/code-coverage/jacoco-ut.exec + true ${project.version} - - - 2.19.3-1 - 1.2.1 - https://nexus.onap.org + **/* + 0.7.5.201505241946 + + 1.4.0 yyyyMMdd'T'HHmm - 3.0.19.Final + original + true + true + true + ${project.version} + ${project.artifactId} + ${dockerPullRepo} + true + https://nexus.onap.org + content/repositories/releases/ + content/repositories/snapshots/ + content/repositories/public/ + content/sites/site/org/onap/so/${project.version}/ + 3.2.6 + 2.1 + 2.0.5.RELEASE + 3.2.0 + false + true ecomp-releases - Clamp Release Repository - https://nexus.onap.org/content/repositories/releases/ + ${nexusproxy}/${releaseNexusPath} ecomp-snapshots - Clamp Snapshot Repository - https://nexus.onap.org/content/repositories/snapshots/ + ${nexusproxy}/${snapshotNexusPath} ecomp-site - dav:https://nexus.onap.org/content/sites/site/org/onap/so/${project.version} + dav:${nexusproxy}${siteNexusPath} @@ -95,78 +113,77 @@ central http://repo1.maven.org/maven2 - - Restlet - Restlet Repository + restlet http://maven.restlet.com + + ecomp-public + ${nexusproxy}/${publicNexusPath} + + false + + + + ecomp-release + ${nexusproxy}/${releaseNexusPath} + + false + + + + ecomp-snapshots + ${nexusproxy}/${snapshotNexusPath} + + false + + - Onap public - https://nexus.onap.org/content/groups/public/ - Onap public - - - JBOSS - JBoss Repository - http://repository.jboss.org/nexus/content/groups/public-jboss/ - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - + ecomp-public + https://nexus.onap.org/content/repositories/public/ false - - jboss-deprecated-repository - JBoss Deprecated Maven Repository - https://repository.jboss.org/nexus/content/repositories/deprecated/ - ecomp-releases - ONAP Release Repository https://nexus.onap.org/content/repositories/releases/ - - - ecomp-staging - ONAP Staging Repository - https://nexus.onap.org/content/repositories/staging/ + + false + ecomp-snapshots - ONAP Snapshot Repository https://nexus.onap.org/content/repositories/snapshots/ - - true - false - - CamundaWebRepo + camunda-bpm https://app.camunda.com/nexus/content/repositories/camunda-bpm/ - Camunda Web Repository - CamundaPublicRepo + camunda-public https://app.camunda.com/nexus/content/groups/public - Camunda Public repository - - soapUI - http://www.soapui.org/repository/maven2/ - SoapUI plugin + + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + false + + + + + onap-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + false + @@ -206,23 +223,12 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8 + 2.8 + - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - ${surefireArgLine} - - - **/IT*.java - - - org.apache.maven.plugins maven-compiler-plugin @@ -235,13 +241,11 @@ true 1.8 1.8 + + -parameters + - - - - - org.apache.maven.plugins maven-ejb-plugin @@ -260,6 +264,7 @@ maven-checkstyle-plugin 2.17 + true **/org/openecomp/**/*.java /google_checks.xml @@ -279,7 +284,7 @@ org.codehaus.mojo sonar-maven-plugin - 3.2 + 5.1 maven-scm-plugin @@ -320,48 +325,309 @@ versions-maven-plugin 1.3.1 + - org.codehaus.mojo - jboss-packaging-maven-plugin - 2.2 - - true + com.fortify.ps.maven.plugin + sca-maven-plugin + 4.20 + + mso-${project.version} + 1.8 + org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + ${jacoco.version} + + + default-prepare-agent + + prepare-agent + + + + default-report + + report + + + + + + org.codehaus.mojo + license-maven-plugin + 1.15 - true + 2017 + ONAP - SO + apache_v2 + false + true + true + ============LICENSE_START======================================================= + ================================================================================ + ============LICENSE_END========================================================= - org.openecomp.* + **/*.java + **/*.groovy + + **/com/att/** + - pre-unit-test + verify-headers - prepare-agent + check-file-header - ${sonar.jacoco.reportPath} - surefireArgLine + true + true - com.fortify.ps.maven.plugin - sca-maven-plugin - 4.20 - - mso-${project.version} - 1.8 - + org.codehaus.gmaven + groovy-maven-plugin + 2.0 + + + + find-basepath + validate + + execute + + + + + + + + + + + net.revelc.code.formatter + formatter-maven-plugin + 2.9.0 + + + format-java + + format + + + ${format.skipExecute} + ${base-path}/project-configs/code-tools/onap-eclipse-format.xml + + + + format-xml + + format + + + ${format.skipExecute} + ${project.basedir} + ${base-path}/project-configs/code-tools/pom-format.properties + + pom.xml + + + + + validate-java + + validate + + + ${format.skipValidate} + ${base-path}/project-configs/code-tools/onap-eclipse-format.xml + + + + validate-poms + + validate + + + ${format.skipValidate} + ${base-path}/project-configs/code-tools/pom-format.properties + + pom.xml + + + + + + + com.fasterxml.jackson.core + jackson-annotations + 2.9.8 + + + + + + io.fabric8 + fabric8-maven-plugin + 3.5.33 + + ${docker.skip} + ${docker.skip.build} + ${docker.skip.push} + ${docker.newHost} + + ${docker.host.cert.path} + + ${dockerPushRepo} + + ${dockerPullRepo} + + + + service + ${artifactId}:${project.version} + + ${project.build.directory} + + + + + + + start + + build + push + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20 + + + DEBUG + + 2 + classes + false + 1 + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.20 + + true + + DEBUG + + 2 + + + + org.apache.maven.plugins + maven-dependency-plugin + + + extract-docker-file + + unpack + + + + + org.onap.so + deployment-configs + ${project.version} + ${project.build.directory} + *,scripts/**,certs/**, logger/*.xml + Kubernetes + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + tests + + test-jar + + + false + + + + original + package + + jar + + + ${originalClassifier} + + ** + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + + build-info + + build-info + + + + + + @@ -369,117 +635,70 @@ com.fasterxml.jackson.core jackson-core - 2.8.7 com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.4.0 com.fasterxml.jackson.core jackson-databind - 2.8.7 com.fasterxml.jackson.core jackson-annotations - 2.8.7 - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - 2.9.2 + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base - com.fasterxml.jackson.jaxrs - jackson-jaxrs-providers - 2.9.2 - pom + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider - org.jboss.resteasy - resteasy-jaxrs - ${resteasy.version} - provided - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - - org.apache.httpcomponents - httpclient - - + javax.ws.rs + javax.ws.rs-api + ${jax.ws.rs} - org.jboss.resteasy - resteasy-client - ${resteasy.version} - provided - - - org.apache.httpcomponents - httpclient - - + javax.annotation + javax.annotation-api + 1.3.1 - org.jboss.resteasy - resteasy-jackson2-provider - 3.1.0.Final + javax.inject + javax.inject + 1 - - org.hamcrest - hamcrest-core - 1.3 - - - org.hamcrest - hamcrest-all - 1.3 - - - junit - junit - 4.12 - test + + org.mockito + mockito-core - org.jmockit - jmockit - 1.19 - test + org.hamcrest + hamcrest-core - org.jmockit - jmockit-coverage - 1.19 - test + org.hamcrest + hamcrest-library - org.powermock - powermock-api-mockito - 1.6.2 + junit + junit test - org.powermock - powermock-module-junit4 - 1.6.2 + xmlunit + xmlunit + 1.6 test com.github.tomakehurst - wiremock - 1.56 + wiremock-standalone + 2.13.0 test - standalone org.mortbay.jetty @@ -524,23 +743,42 @@ - org.jboss.resteasy - tjws - ${resteasy.version} + com.openpojo + openpojo + 0.8.10 + + + com.shazam + shazamcrest + 0.11 + test + + + com.google.guava + guava + + + org.apache.commons + commons-lang3 + + + + + org.assertj + assertj-core + 3.11.1 test + + com.googlecode.junit-toolbox + junit-toolbox + 2.4 + - - - org.apache.httpcomponents - httpclient - 4.5.5 - compile - + org.apache.httpcomponents httpcore @@ -560,29 +798,101 @@ compile - log4j - log4j - 1.2.17 + com.sun.xml.fastinfoset + FastInfoset + 1.2.13 compile - org.slf4j - slf4j-api - 1.7.10 - compile + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import - com.sun.xml.fastinfoset - FastInfoset - 1.2.13 - compile + org.yaml + snakeyaml + 1.23 + + + javax.interceptor + javax.interceptor-api + 1.2.2 + + + org.springframework.boot + spring-boot-starter-test + ${springboot.version} + + + com.vaadin.external.google + android-json + + + + + net.javacrumbs.shedlock + shedlock-spring + 0.18.2 + + + net.javacrumbs.shedlock + shedlock-provider-jdbc-template + 0.18.2 + + + org.flywaydb + flyway-core + 5.1.4 + + + org.json + json + 20140107 + + + org.yaml + snakeyaml + 1.19 - - org.mockito - mockito-core - 1.10.19 - test - + + + docker-image-build + + false + false + true + + + + docker-image-build-push + + false + false + false + true + + + + format + + true + false + + + + m2e + + + m2e.version + + + + + + +