From: Dan Timoney <dtimoney@att.com>
Date: Wed, 28 Aug 2019 15:39:38 +0000 (+0000)
Subject: Merge "Update to use released version 0.6.0"
X-Git-Tag: 0.6.0~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=31b41948c0438c45be73548281115291dd4e1ec9;hp=e385a7a1d1934c6a3d22df3c3244678ca415134a

Merge "Update to use released version 0.6.0"
---

diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 8f347280..1ed67c09 100644
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index f1339d17..2116fcd4 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.0</version>
         <relativePath/>
     </parent>
 
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 2bee0803..40264315 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 		<relativePath/>
 	</parent>
 
@@ -25,7 +25,7 @@
 		<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
 		<ccsdk.project.version>${project.version}</ccsdk.project.version>
 		<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-		<ccsdk.features.version>0.6.0-SNAPSHOT</ccsdk.features.version>
+		<ccsdk.features.version>0.6.0</ccsdk.features.version>
 		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 		<opendaylight.root>opt/opendaylight</opendaylight.root>
@@ -36,10 +36,10 @@
 		<ccsdk.odl.features>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.sli.core.version>0.6.0-SNAPSHOT</ccsdk.sli.core.version>
-		<ccsdk.sli.adaptors.version>0.6.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-		<ccsdk.sli.northbound.version>0.6.0-SNAPSHOT</ccsdk.sli.northbound.version>
-		<ccsdk.sli.plugins.version>0.6.0-SNAPSHOT</ccsdk.sli.plugins.version>
+		<ccsdk.sli.core.version>0.6.0</ccsdk.sli.core.version>
+		<ccsdk.sli.adaptors.version>0.6.0</ccsdk.sli.adaptors.version>
+		<ccsdk.sli.northbound.version>0.6.0</ccsdk.sli.northbound.version>
+		<ccsdk.sli.plugins.version>0.6.0</ccsdk.sli.plugins.version>
 	</properties>
 
 	<dependencies>
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index ede48242..60f675cf 100644
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0</version>
 		<relativePath/>
 	</parent>
 
@@ -25,7 +25,7 @@
 		<image.name>onap/ccsdk-odlsli-image</image.name>
 		<ccsdk.project.version>${project.version}</ccsdk.project.version>
 		<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-		<ccsdk.features.version>0.6.0-SNAPSHOT</ccsdk.features.version>
+		<ccsdk.features.version>0.6.0</ccsdk.features.version>
 		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 		<opendaylight.root>opt/opendaylight</opendaylight.root>
@@ -36,10 +36,10 @@
 		<ccsdk.odl.features>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.sli.core.version>0.6.0-SNAPSHOT</ccsdk.sli.core.version>
-		<ccsdk.sli.adaptors.version>0.6.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-		<ccsdk.sli.northbound.version>0.6.0-SNAPSHOT</ccsdk.sli.northbound.version>
-		<ccsdk.sli.plugins.version>0.6.0-SNAPSHOT</ccsdk.sli.plugins.version>
+		<ccsdk.sli.core.version>0.6.0</ccsdk.sli.core.version>
+		<ccsdk.sli.adaptors.version>0.6.0</ccsdk.sli.adaptors.version>
+		<ccsdk.sli.northbound.version>0.6.0</ccsdk.sli.northbound.version>
+		<ccsdk.sli.plugins.version>0.6.0</ccsdk.sli.plugins.version>
 	</properties>
 
 	<dependencies>
diff --git a/pom.xml b/pom.xml
index 1c58eb5b..2ce66769 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.0</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>