X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fdata-router.git;a=blobdiff_plain;f=pom.xml;h=ddc094de1c8c03598ab88f61312a43319f755002;hp=42f51a9e70bc5b0ccc0322fa401f9c38225fb396;hb=refs%2Fheads%2Fmaster;hpb=4b3414f52f740e8c46075e6b45a22d8b90844783 diff --git a/pom.xml b/pom.xml index 42f51a9..ddc094d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,40 +1,66 @@ + + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - ajsc-archetype-parent - com.att.ajsc - 2.0.0 - - org.onap.aai.data-router - data-router - 1.2.0-SNAPSHOT - aai-data-router + + org.springframework.boot + spring-boot-starter-parent + 2.3.1.RELEASE + + + org.onap.aai.data-router + data-router + 1.8.0-SNAPSHOT + aai-data-router - ${basedir}/target - data-router - v1 - 2.0.0 + 1.8 + 3.4.0 /appl/${project.artifactId} - + property, below. PLEASE, NOTE: If your ${project.version} is a "-SNAPSHOT" + version, THIS will be used as your directory structure. If you do NOT want + this, simply remove the "-SNAPSHOT" from your declaration at the + top of pom.xml --> /appl/${project.artifactId}/${project.version} - ${basedir}/target/swm/package/nix/dist_files${distFilesRoot} - aaiadmin aaiadmin com.att.csid.lab + 1.7.9 + + + 0.28.0 + 1.0.0 + ${project.build.directory}/${project.artifactId}-build/ + + onap + alpine + 1.6.0 + For local testing, you may choose to hardcode this value to something like + 8080 --> 0 9502 @@ -42,65 +68,136 @@ DEV google_checks.xml https://nexus.onap.org - - java - jacoco - ${project.build.directory}/surefire-reports - ${project.build.directory}/coverage-reports/jacoco.exec - false - ${project.version} + + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + false + ${project.version} + 1.2.3 + 16.0.1 + onap + 0.58 + + yyyyMMdd'T'HHmmss'Z' - - org.powermock - powermock-module-junit4 - 1.6.2 - test - - - - org.powermock - powermock-api-mockito - 1.6.2 - test - - - - org.powermock - powermock-module-javaagent - 1.6.2 - test - - - - org.powermock - powermock-module-junit4-rule-agent - 1.6.2 - test - - dom4j + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + ch.qos.logback + logback-access + ${logback.version} + + + org.apache.camel.springboot + camel-spring-boot-starter + ${camel-spring-boot.version} + + + org.apache.camel + camel-core + ${camel-spring-boot.version} + + + org.apache.camel.springboot + camel-servlet-starter + ${camel-spring-boot.version} + + + org.apache.camel + camel-cxf + ${camel-spring-boot.version} + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-jetty + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-actuator + + + javax.ws.rs + javax.ws.rs-api + 2.1 + + + org.powermock + powermock-module-junit4 + 1.6.2 + test + + + + org.assertj + assertj-core + 3.10.0 + test + + + org.powermock + powermock-api-mockito + 1.6.2 + test + + + + org.powermock + powermock-module-javaagent + 1.6.2 + test + + + + org.powermock + powermock-module-junit4-rule-agent + 1.6.2 + test + + + org.dom4j dom4j - 1.6.1 provided + 2.1.1 com.att.aft dme2 - 3.1.200 + 3.1.200-oss provided - - org.onap.aai.aai-common - aai-schema - ${project.version} - + org.onap.aai.router-core router-core - 1.1.0 + 1.7.0 @@ -117,31 +214,222 @@ org.eclipse.persistence eclipselink - 2.6.2 + 2.7.7 - org.onap.aai.logging-service - common-logging - 1.1.0 - + org.onap.aai.logging-service + common-logging + 1.5.0 + + + + org.onap.aai.logging-service + logging-api + 1.5.0 + org.onap.aai rest-client - 1.1.0 + 1.2.1 - ch.qos.logback - logback-core - 1.1.7 + com.google.guava + guava + ${version.com.google.guava} + + + + org.glassfish + javax.json + 1.1 + + + docker + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + pre-clean + parse-version + + parse-version + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + pre-clean + + 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 + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-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 + + + + + + + + + + ${project.artifactId} + + + org.jacoco + jacoco-maven-plugin + + + + pre-unit-test + + prepare-agent + + + + ${sonar.jacoco.reportPath} + surefireArgLine + + + + + post-unit-test + test + + report + + + + ${sonar.jacoco.reportPath} + + ${jacoco.path} + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + + ${sonar.jacoco.itReportPath} + + failsafeArgLine + + + + + post-integration-test + post-integration-test + + report + + + + ${sonar.jacoco.itReportPath}/ + + ${jacoco.itPath} + + + + @@ -165,88 +453,93 @@ + - org.apache.maven.plugins - maven-resources-plugin - 2.7 + org.springframework.boot + spring-boot-maven-plugin + + + + maven-assembly-plugin + + + src/main/assembly/descriptor.xml + + - copy-docker-file + make-assembly package - copy-resources + single - - target - true - - - ${basedir}/src/main/docker - true - - **/* - - - - ${basedir}/src/main/bin/ - - - + - com.spotify - docker-maven-plugin - 0.4.11 + maven-surefire-plugin + 2.21.0 - true - docker-hub - ${docker.push.registry}/onap/${project.artifactId} - ${docker.location} - - latest - - true + + ${aai.build.directory} + ${project.basedir}/src/test/resources/config + ${project.basedir}/src/test/resources/spring-beans + ${shemaUnpackVersion} + - + - com.mycila - license-maven-plugin - 3.0 - -
License.txt
- - src/main/java/** - - + org.apache.maven.plugins + maven-dependency-plugin + unpack + initialize - format + unpack - process-sources + + + + org.onap.aai.schema-service + aai-schema + ${version.aai-schema} + jar + /${shemaUnpackVersion}/oxm/ + ${aai.build.directory} + + + - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - + + org.apache.maven.plugins maven-deploy-plugin - - true - org.codehaus.mojo @@ -256,7 +549,7 @@ org.jacoco jacoco-maven-plugin - 0.7.7.201606060606 + 0.8.5 true @@ -271,134 +564,48 @@ + + default-check + + check + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + BUNDLE + + + LINE + COVEREDRATIO + ${jacoco.line.coverage.limit} + + + + + + - + - - - runAjsc - - initialize - - - org.codehaus.mojo - exec-maven-plugin - 1.3.2 - - - initialize - - java - - - false - true - java - com.att.ajsc.runner.Runner - - com.att.ajsc - ajsc-runner - - - ${basedir}/ajsc-shared-config/etc - - - - ${runAjscHome} - - - - - - AJSC_HOME - ${runAjscHome} - - - - CONFIG_HOME - ${basedir}/appconfig-local/ - - - - AJSC_CONF_HOME - ${basedir}/bundleconfig-local - - - logback.configurationFile - ${basedir}/ajsc-shared-config/etc/logback.xml - - - AJSC_SHARED_CONFIG - ${basedir}/ajsc-shared-config - - - - AJSC_EXTERNAL_LIB_FOLDERS - ${basedir}/target/commonLibs - - - AJSC_EXTERNAL_PROPERTIES_FOLDERS - ${basedir}/ajsc-shared-config/etc - - - - AJSC_SERVICE_NAMESPACE - ${module.ajsc.namespace.name} - - - AJSC_SERVICE_VERSION - ${module.ajsc.namespace.version} - - - SOACLOUD_SERVICE_VERSION - ${project.version} - - - server.port - ${serverPort} - - - - - - context=/ - port=${serverPort} - sslport=${sslport} - - - - - - java - - - - com.att.ajsc - ajsc-runner - ${ajscRuntimeVersion} - - - - - - - - + + + org.apache.camel.springboot + camel-spring-boot-dependencies + ${camel-spring-boot.version} + pom + import + org.apache.httpcomponents httpclient - 4.5 + 4.5.5 org.apache.httpcomponents @@ -410,6 +617,23 @@ json 20131018 + + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + +