X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ms%2Fneng%2Fpom.xml;h=9c2e4c8bed15a908922c59a86917c67982a91a9a;hb=9d3cc4fdc90e64d2c8977d5537f915afbc1dce58;hp=ed68afb43c07155ac51ed5f6af7dc3a80e608cc1;hpb=41897b1434755fd8b5faa3c9ba548b89c2105d6a;p=ccsdk%2Fapps.git
diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index ed68afb4..9c2e4c8b 100644
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -23,7 +23,7 @@
org.onap.ccsdk.apps
ccsdk-apps-ms-neng
- 0.4.1-SNAPSHOT
+ 0.7.0-SNAPSHOT
Naming Generation
@@ -42,15 +42,6 @@
1.8
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.2.4
${https_proxy}
@@ -59,7 +50,9 @@
${project.version}
onap/ccsdk-apps-ms-neng
${maven.build.timestamp}
- yyyyMMddHHmmss
+ yyyyMMddHHmmss
+ ${project.version}
+ ${maven.build.timestamp}
@@ -198,9 +191,9 @@
try
${basedir}/target/docker-stage
- ${project.version}
- ${project.docker.latesttag.version}
- ${project.version}-STAGING-${maven.build.timestamp}
+ ${project.docker.latestminortag.version}
+ ${project.docker.latestfulltag.version}
+ ${project.docker.latesttagtimestamp.version}
@@ -241,7 +234,7 @@
org.onap.ccsdk.parent
spring-boot-1-starter-parent
- 1.2.1-SNAPSHOT
+ 1.5.2-SNAPSHOT
@@ -251,44 +244,36 @@
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
@@ -298,12 +283,10 @@
javax.ws.rs
javax.ws.rs-api
- 2.1
commons-lang
commons-lang
- 2.6
org.liquibase
@@ -312,7 +295,6 @@
org.mariadb.jdbc
mariadb-java-client
- ${mariadb.connector.version}
com.h2database
@@ -321,19 +303,16 @@
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
@@ -342,27 +321,22 @@
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}
@@ -381,71 +355,7 @@
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}
+ ${basedir}/../../TagVersion.groovy
@@ -516,7 +426,6 @@
org.springframework.boot
spring-boot-maven-plugin
- ${springboot.version}