From fff64f89ef68f9f6a31d462507495115b81c04f9 Mon Sep 17 00:00:00 2001
From: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Date: Fri, 30 Apr 2021 18:27:32 +0200
Subject: [PATCH] Adjust odlsli version numbers and fix artifact ids

Fix artifact saltstack-adaptor-installer and ansible-adaptor-installer

Issue-ID: CCSDK-3282
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I7017c4181db938e1a996c38dabb11b9ca99c1302
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
---
 odlsli/odlsli-alpine/pom.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 41ef7b73..827ab4a7 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -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>
-- 
2.16.6