Adjust odlsli version numbers and fix artifact ids

[ccsdk/distribution.git] / odlsli / odlsli-alpine / pom.xml

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index aff94dd..827ab4a 100644 (file)
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-odlsli</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli-alpine</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli-alpine</name>
@@ -38,12 +38,8 @@
             ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all
         </ccsdk.odl.features>
         <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
-       <ccsdk.features.version>1.1.1</ccsdk.features.version>
-       <ccsdk.sli.core.version>1.2.0</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.2.0</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.2.0</ccsdk.sli.northbound.version>
-           <ccsdk.sli.plugins.version>1.2.0</ccsdk.sli.plugins.version>
-        <ccsdk.oran.a1adapter.version>1.1.1</ccsdk.oran.a1adapter.version>
+        <!-- Version definition is placed in org.onap.ccsdk.parent/oparent -->
+        <ccsdk.oran.a1adapter.version>1.2.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
     </properties>
 
@@ -114,7 +110,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-            <artifactId>ansible-adapter-installer</artifactId>
+            <artifactId>ansible-adaptor-installer</artifactId>
             <version>${ccsdk.sli.adaptors.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
@@ -156,7 +152,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-            <artifactId>saltstack-adapter-installer</artifactId>
+            <artifactId>saltstack-adaptor-installer</artifactId>
             <version>${ccsdk.sli.adaptors.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
@@ -615,6 +611,7 @@
                                     <name>${image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
+                                        <noCache>true</noCache>
                                         <contextDir>${basedir}/target/docker-stage</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>