X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ms%2Fneng%2Fpom.xml;h=36bb45c2966f41e8981e0a9301d7f58da01cabef;hb=6a7f13fa7e284cbec5b0743c10fdd33286aaf2ec;hp=8f6c7b15e647e09fcd9b9a75bc5825c96cc906f8;hpb=613b05fe39d8e2a9e55e8df1e844dec37e900646;p=ccsdk%2Fapps.git diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml index 8f6c7b15..36bb45c2 100644 --- a/ms/neng/pom.xml +++ b/ms/neng/pom.xml @@ -1,5 +1,5 @@ - - + 4.0.0 + + org.onap.ccsdk.apps + ccsdk-apps-ms + 1.6.0-SNAPSHOT + + org.onap.ccsdk.apps ccsdk-apps-ms-neng - 0.3.0-SNAPSHOT + 1.6.0-SNAPSHOT + + Naming Generation + + + + ${userId} + + ${basedir}/target/classes/META-INF/resources/swagger service.json org.onap.ccsdk.apps.ms.neng.service.rs - 1.8 - 4.3.8.RELEASE - 1.5.6.RELEASE + 11 nexus3.onap.org:10001 local TBD TBD org.onap.ccsdk.apps.ms.neng - 1.8 - 1.8 + 11 + 11 UTF-8 6.2.0.11 - jacoco - reuseReports - ${basedir}/target/surefire-reports - ${basedir}/target/failsafe-reports - ${basedir}/target/jacoco_report - ${basedir}/target/jacoco_itReport - ${basedir}/target/jacoco-ut.exec - ${basedir}/target/jacoco-it.exec - java ms-networkelementnamegen - 0.3.0 - 0.2.4 + 1.5.0-SNAPSHOT ${https_proxy} deploy - deploy true ${project.version} + onap/ccsdk-alpine-j11-image + 1.5-STAGING-latest onap/ccsdk-apps-ms-neng + ${maven.build.timestamp} + yyyyMMddHHmmss + ${project.version} + ${maven.build.timestamp} - - - all-tests - - all-tests - false - false - - - - dev - - - integration-test - - integration-test - false - true - - - - - blackduck - - - blackduck-scan - - - - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - - - - - - docker - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - ${docker.build.phase} - - ${basedir}/target/docker-stage - - - src/main/docker - - startService.sh - Dockerfile - - true - - - - - - copy-app-jar - - copy-resources - - ${docker.build.phase} - - ${basedir}/target/docker-stage - - - ${basedir}/target/ - - NetworkElementNameGen.jar - - false - - - - - - copy-config - - copy-resources - - ${docker.build.phase} - - ${basedir}/target/docker-stage/opt/etc/config - - - ${basedir}/opt/etc/config - - * - - true - - - - - - - - - - io.fabric8 - docker-maven-plugin - 0.26.1 - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - - ${project.version} - ${project.docker.latesttag.version} - - - - - true - - - - push-images - ${docker.build.phase} - - build - push - - - - - - - - - - - - - ${userId} - - - - - - org.onap.ccsdk.parent - odlparent-lite - 1.1.0-SNAPSHOT - - - - - - - org.springframework.boot - spring-boot-starter-parent - ${springboot.version} - pom - import - - - - io.swagger swagger-core - 1.5.20 org.springframework.boot spring-boot-starter-web - ${springboot.version} org.springframework.boot spring-boot-starter-jersey - ${springboot.version} org.springframework.boot spring-boot-starter-actuator - ${springboot.version} org.springframework.boot spring-boot-loader-tools - ${springboot.version} org.springframework.boot spring-boot-starter-test - ${springboot.version} test org.springframework.boot spring-boot-starter-tomcat - ${springboot.version} compile org.springframework.boot spring-boot-starter-data-jpa - ${springboot.version} compile - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 javax.ws.rs javax.ws.rs-api - 2.1 commons-lang commons-lang - 2.6 org.liquibase @@ -315,28 +124,20 @@ org.mariadb.jdbc mariadb-java-client - ${mariadb.connector.version} - - - com.h2database - h2 org.springframework.boot spring-boot-configuration-processor - ${springboot.version} true org.springframework spring-test - ${spring.version} test org.springframework spring-aop - ${spring.version} org.springframework @@ -345,208 +146,74 @@ org.springframework spring-beans - ${spring.version} org.springframework spring-context - ${spring.version} org.springframework spring-core - ${spring.version} org.springframework spring-expression - ${spring.version} org.springframework spring-web - ${spring.version} + + + + org.elasticsearch + elasticsearch + 7.13.4 + + + io.searchbox + jest + 5.3.3 + + + org.onap.ccsdk.sli.core + utils-provider + ${ccsdk.sli.version} + + + com.google.code.gson + gson + ${gson.version} + + + junit + junit + test + + + com.h2database + h2 + test NetworkElementNameGen - - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - validate - - execute - - - - println project.properties['ccsdk.project.version']; - def versionArray; - if (project.properties['ccsdk.project.version'] != null ) { - versionArray = project.properties['ccsdk.project.version'].split('\\.'); - } - - if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) - { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest"; - } - - println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; - - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 - - - 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} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${surefireArgLine} - ${skip.unit.tests} - - **/IT*.java - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - integration-tests - - integration-test - verify - - - ${failsafeArgLine} - ${skip.integration.tests} - - - - - - maven-dependency-plugin - - - com.github.kongchen - swagger-maven-plugin - 3.1.3 - - - - org.onap.ccsdk.apps.ms.neng.service.rs - /web - - ${project.artifactId} Service - ${project.version} - - ${swagger.directory} - - - - - - package - - generate - - - - - - - exec-maven-plugin - org.codehaus.mojo - - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - - - repackage - - - - - - - - - src/main/resources - true - - **/* - - - - opt/aai/keystore - ../opt/aai/keystore - false - - **/* - - + + + src/main/resources + true + + **/* + + + + opt/aai/keystore + ../opt/aai/keystore + false + + **/* + + opt/etc/config @@ -599,7 +266,7 @@ - + @@ -620,7 +287,7 @@ - + @@ -629,7 +296,267 @@ + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + validate + + execute + + + ${basedir}/../../TagVersion.groovy + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${surefireArgLine} + ${skip.unit.tests} + + **/IT*.java + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-tests + + integration-test + verify + + + ${failsafeArgLine} + ${skip.integration.tests} + + + + + + maven-dependency-plugin + + + com.github.kongchen + swagger-maven-plugin + 3.1.3 + + + + org.onap.ccsdk.apps.ms.neng.service.rs + /web + + ${project.artifactId} Service + ${project.version} + + ${swagger.directory} + + + + + + package + + generate + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + - - + + + all-tests + + all-tests + false + false + + + + dev + + + integration-test + + integration-test + false + true + + + + + blackduck + + + blackduck-scan + + + + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + + + + + + docker + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + startService.sh + Dockerfile + + true + + + + + + copy-app-jar + + copy-resources + + package + + ${basedir}/target/docker-stage + + + ${basedir}/target/ + + NetworkElementNameGen.jar + + false + + + + + + copy-config + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/etc/config + + + ${basedir}/opt/etc/config + + * + + true + + + + + + + + + + io.fabric8 + docker-maven-plugin + 0.28.0 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + true + + + + generate-images + package + + build + + + + push-images + ${docker.push.phase} + + build + push + + + + + + + + + +