X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=d9946df3bb68968f1fcdfa6a6a254ca6f3990593;hb=refs%2Fchanges%2F39%2F127939%2F1;hp=16c478c95b9d6722848c61dba2d547efd814cf97;hpb=7e6fe8c29c5a5cfa5caf6ab47b30280e1fc20432;p=aai%2Fmodel-loader.git
diff --git a/pom.xml b/pom.xml
index 16c478c..d9946df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,13 +26,14 @@
org.onap.oparent
oparent
- 1.1.1
+ 2.1.0
org.onap.aai.model-loader
model-loader
- 1.3.0-SNAPSHOT
+ aai-model-loader
+ 1.9.4-SNAPSHOT
@@ -50,33 +51,184 @@
org.onap.aai.modelloader.service.ModelLoaderApplication
https://nexus.onap.org
${basedir}/target
- 1.5.12.RELEASE
- 1.1
- 1.14
+ 2.1.12.RELEASE
+ 1.8
+ 1.19
1.3
- 1.2.0
+ 1.9.5
1.2.1
- 1.3.0
+ 1.4.1
1.2.3
+
+ 0.28.0
+ 1.0.0
+ ${project.build.directory}/${project.artifactId}-${project.version}-build/
+ onap
+ alpine
+ 1.8.1
+
+ yyyyMMdd'T'HHmmss'Z'
+
+
+
+
+
+ 0.75
+ 0.8.5
+ 3.2
+ jacoco
+ ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+ **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**
+
+ 3.7.0.1746
+
+ 3.2.0
+ 3.8.1
+ 11
+ 11
+ 11
+ 11
-
-
- ecomp-releases
- ECOMP Release Repository
- ${nexusproxy}/content/repositories/releases/
-
-
- ecomp-snapshots
- ECOMP Snapshot Repository
- ${nexusproxy}/content/repositories/snapshots/
-
-
+
+
+ ecomp-releases
+ ECOMP Release Repository
+ ${nexusproxy}/content/repositories/releases/
+
+
+ ecomp-snapshots
+ ECOMP Snapshot Repository
+ ${nexusproxy}/content/repositories/snapshots/
+
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-jetty
+
org.springframework.boot
spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
org.onap.aai
@@ -117,17 +269,17 @@
org.onap.aai.logging-service
common-logging
- 1.2.2
+ 1.5.0
ch.qos.logback
logback-classic
- ${logback.version}
+ ${logback.version}
ch.qos.logback
logback-core
- ${logback.version}
+ ${logback.version}
org.onap.sdc.sdc-distribution-client
@@ -143,10 +295,6 @@
org.eclipse.jetty
jetty-security
-
- org.springframework
- spring-webmvc
-
jline
jline
@@ -160,77 +308,88 @@
commons-io
commons-io
- 2.4
+ 2.11.0
org.apache.commons
commons-text
${apache.commons-text.version}
-
-
-
- junit
- junit
- test
-
-
- org.hamcrest
- hamcrest-all
- ${hamcrest-all.version}
- test
-
-
- org.mockito
- mockito-core
- test
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
+
+
+
+ junit
+ junit
+ test
+
+
+ org.hamcrest
+ hamcrest-all
+ ${hamcrest-all.version}
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
-
-
-
- central
- http://repo1.maven.org/maven2
-
-
- EvoSuite
- EvoSuite Repository
- http://www.evosuite.org/m2
-
-
+
+
+
+ central
+ http://repo1.maven.org/maven2
+
+
+ EvoSuite
+ EvoSuite Repository
+ http://www.evosuite.org/m2
+
+
-
-
- central
- Maven 2 repository 2
- http://repo2.maven.org/maven2/
-
-
- ecomp-releases
- ECOMP Release Repository
- ${nexusproxy}/content/repositories/releases/
-
-
- ecomp-snapshots
- ECOMP Snapshot Repository
- ${nexusproxy}/content/repositories/snapshots/
-
-
- ecomp-staging
- ECOMP Staging Repository
- ${nexusproxy}/content/repositories/staging/
-
-
+
+
+ central
+ Maven 2 repository 2
+ http://repo2.maven.org/maven2/
+
+
+ ecomp-releases
+ ECOMP Release Repository
+ ${nexusproxy}/content/repositories/releases/
+
+
+ ecomp-snapshots
+ ECOMP Snapshot Repository
+ ${nexusproxy}/content/repositories/snapshots/
+
+
+ ecomp-staging
+ ECOMP Staging Repository
+ ${nexusproxy}/content/repositories/staging/
+
+
- model-loader
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${maven-compiler-plugin.version}
+ true
+
+
+ ${maven-compiler-plugin.target}
+ ${maven-compiler-plugin.test.source}
+ ${maven-compiler-plugin.test.target}
+
+
org.springframework.boot
spring-boot-maven-plugin
@@ -247,88 +406,200 @@
- org.apache.maven.plugins
- maven-resources-plugin
- 2.7
+ com.mycila
+ license-maven-plugin
+ 3.0
+
+
+
+ src/main/java/**
+ src/test/java/**
+ version/properties
+ pom.xml
+
+ true
+
- copy-docker-file
- package
- copy-resources
+
+ check
-
- target
- true
-
-
- ${basedir}/src/main/docker
- true
-
- **/*
-
-
-
- ${basedir}/src/main/bin/
-
-
-
+ process-sources
-
- com.mycila
- license-maven-plugin
- 3.0
-
-
-
- src/main/java/**
- src/test/java/**
- version/properties
- pom.xml
-
- true
-
-
-
-
-
- check
-
- process-sources
-
-
-
- com.spotify
- docker-maven-plugin
- 0.4.11
-
-
- com.github.jnr
- jnr-unixsocket
- 0.13
-
-
+ org.apache.maven.plugins
+ maven-deploy-plugin
- true
- docker-hub
- ${docker.push.registry}/onap/${project.artifactId}
- ${docker.location}
-
- latest
-
- true
+ client
- org.apache.maven.plugins
- maven-deploy-plugin
+ maven-assembly-plugin
- true
+
+ src/main/assembly/descriptor.xml
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco.version}
+
+
+
+ **/gen/**
+ **/generated-sources/**
+ **/yang-gen/**
+ **/pax/**
+
+
+
+
+
+ pre-unit-test
+
+ prepare-agent
+
+
+
+ ${project.build.directory}/code-coverage/jacoco-ut.exec
+
+ surefireArgLine
+
+
+
+
+ post-unit-test
+ test
+
+ report
+
+
+
+ ${project.build.directory}/code-coverage/jacoco-ut.exec
+
+ ${project.reporting.outputDirectory}/jacoco-ut
+
+
+
+ pre-integration-test
+ pre-integration-test
+
+ prepare-agent
+
+
+
+ ${project.build.directory}/code-coverage/jacoco-it.exec
+
+ failsafeArgLine
+
+
+
+
+ post-integration-test
+ post-integration-test
+
+ report
+
+
+
+ ${project.build.directory}/code-coverage/jacoco-it.exec
+
+ ${project.reporting.outputDirectory}/jacoco-it
+
+
+
+ default-check
+
+ check
+
+
+ ${project.build.directory}/code-coverage/jacoco-ut.exec
+
+
+ BUNDLE
+
+
+ LINE
+ COVEREDRATIO
+ ${jacoco.line.coverage.limit}
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 3.0.0-M4
+
+
+ ${surefireArgLine}
+
+
+ **/IT*.java
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ 3.0.0-M4
+
+
+
+ integration-tests
+
+ integration-test
+ verify
+
+
+
+ ${failsafeArgLine}
+
+
+
+
+
+ org.sonarsource.scanner.maven
+ sonar-maven-plugin
+ ${sonar.scanner.version}
+
+
+
+