X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=champ-service%2Fpom.xml;h=0d32783ec9fc56e077410a480608170ebfe6ff5b;hb=HEAD;hp=728687441bd50bf8655b1de2387cc30e5b67e918;hpb=e9aac8f967ff16fb9a4ce9cbb072e02fe713acd0;p=aai%2Fchamp.git
diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 7286874..f2b8463 100644
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -26,23 +26,35 @@ limitations under the License.
org.onap.aai
champ
- 1.3.0-SNAPSHOT
+ 1.6.0-SNAPSHOT
org.onap.aai.champ
champ-service
- ${basedir}/target
- champ
https://nexus.onap.org
org.onap.aai.logging-service
1.2.2
- 18.0
3.7
1.3
- 1.5.12.RELEASE
+ 1.5.21.RELEASE
+
+ 0.16
+
+
+ champ
+ 0.28.0
+ 1.0.0
+ ${project.build.directory}/${project.artifactId}-build/
+
+ onap
+ alpine
+ 1.6.0
+
+ yyyyMMdd'T'HHmmss'Z'
@@ -92,14 +104,44 @@ limitations under the License.
org.springframework.boot
- spring-boot-starter-jersey
+ spring-boot-starter-test
+ test
+
+
+ org.powermock
+ powermock-module-junit4
+ 1.7.4
+ test
+
+
+ org.javassist
+ javassist
+
+
+
+
+ org.powermock
+ powermock-api-mockito
+ 1.7.4
+ test
+
- dom4j
- dom4j
- 1.6.1
- provided
+ org.javassist
+ javassist
+ 3.22.0-GA
+
+
+
+ org.springframework.boot
+ spring-boot-starter-jersey
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
@@ -120,10 +162,9 @@ limitations under the License.
2.6.2
-
- com.google.guava
- guava
- ${version.com.google.guava}
+
+ com.google.guava
+ guava
@@ -247,44 +288,19 @@ limitations under the License.
- org.apache.maven.plugins
- maven-resources-plugin
- 2.7
+ 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/
-
-
- ../champ-service-deps-janus/target/
-
-
- ../champ-service-deps-titan/target/
-
-
- ${basedir}
-
- **/dynamic/**/*
-
-
-
-
@@ -312,37 +328,126 @@ limitations under the License.
-
-
- com.spotify
- docker-maven-plugin
- 0.4.11
-
- true
- docker-hub
- ${docker.push.registry}/onap/${docker.name}
- ${docker.location}
-
- latest
-
- true
-
-
-
org.apache.maven.plugins
maven-deploy-plugin
-
-
- org.sonatype.plugins
- nexus-staging-maven-plugin
-
-
org.apache.maven.plugins
maven-site-plugin
+
+
+
+ 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}/${docker.image.name}:%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
+
+
+
+
+
+
+
+