X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=8dc1cd1e308968340fbfd9ce9ae1e36d01680016;hb=refs%2Fchanges%2F94%2F92794%2F6;hp=af1015035378705c79a9119fdd835be5110f10a8;hpb=095e2020589c3324b50203315fab0ae8b50e145e;p=aai%2Fmodel-loader.git
diff --git a/pom.xml b/pom.xml
index af10150..8dc1cd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,14 +26,14 @@
org.onap.oparent
oparent
- 1.2.1
+ 2.0.0
org.onap.aai.model-loader
model-loader
aai-model-loader
- 1.4.1-SNAPSHOT
+ 1.5.0-SNAPSHOT
@@ -51,7 +51,7 @@
org.onap.aai.modelloader.service.ModelLoaderApplication
https://nexus.onap.org
${basedir}/target
- 1.5.20.RELEASE
+ 2.1.6.RELEASE
1.1
1.18
1.3
@@ -59,6 +59,15 @@
1.2.1
1.3.0
1.2.3
+
+ 0.28.0
+ 1.0.0
+ ${project.build.directory}/${project.artifactId}-${project.version}-build/
+ onap
+ alpine
+ 1.6.0
+
+ yyyyMMdd'T'HHmmss'Z'
@@ -74,6 +83,118 @@
+
+
+
+ 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
@@ -128,7 +249,7 @@
org.onap.aai.logging-service
common-logging
- 1.2.2
+ 1.5.0
ch.qos.logback
@@ -236,7 +357,6 @@
- model-loader
org.springframework.boot
@@ -253,36 +373,6 @@
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.7
-
-
- copy-docker-file
- package
-
- copy-resources
-
-
- target
- true
-
-
- ${basedir}/src/main/docker
- true
-
- **/*
-
-
-
- ${basedir}/src/main/bin/
-
-
-
-
-
-
com.mycila
license-maven-plugin
@@ -308,26 +398,28 @@
- com.spotify
- docker-maven-plugin
- 0.4.11
+ org.apache.maven.plugins
+ maven-deploy-plugin
- true
- docker-hub
- ${docker.push.registry}/onap/${project.artifactId}
- ${docker.location}
-
- latest
-
- true
+ true
- org.apache.maven.plugins
- maven-deploy-plugin
+ maven-assembly-plugin
- true
+
+ src/main/assembly/descriptor.xml
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+