Port to Neon
Port sdnc/oam to Neon version of CCSDK and SDNC artifacts
Change-Id: I4a195d0c5e993c433c0c03a898d60521c7df2a9f
Issue-ID: SDNC-850
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: 18aff1a38583891cbcddca7242e2326b80d88a8d
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 8e38a4c..da2c445 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -4,13 +4,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.2</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-ansible-server</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates ansible-server Docker container</description>
@@ -19,7 +19,7 @@
<image.name>onap/sdnc-ansible-server-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
- <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
+ <ccsdk.docker.version>0.6-STAGING-latest</ccsdk.docker.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
</properties>
@@ -79,7 +79,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.28.0</version>
<inherited>false</inherited>
<configuration>
<images>
@@ -88,7 +88,7 @@
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>