Roll master to Guilin

Roll versions of master for early Guilin development

Change-Id: I9ad7859eb294120542bce6faadb83b383e963fa7
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>

6 files changed, 13 insertions, 24 deletions

diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index d1dde52f..5fb0b5ff 100755
--- a/sli/common/pom.xml
+++ b/sli/common/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli-common</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
@@ -23,7 +23,6 @@
 
     </properties>
 
-
     <dependencies>
         <dependency>
             <groupId>org.apache.derby</groupId>
diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index 5e5d099e..3061253b 100755
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.2</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
 	<artifactId>sli-installer</artifactId>
-	<version>0.7.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
@@ -22,7 +22,7 @@
 		<features.repositories>mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features</features.repositories>
 		<include.transitive.dependencies>false</include.transitive.dependencies>
 	</properties>
-	
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -32,7 +32,6 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-	
 	<dependencies>
 
 		<dependency>
diff --git a/sli/model/pom.xml b/sli/model/pom.xml
index c330646c..6951b89c 100755
--- a/sli/model/pom.xml
+++ b/sli/model/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli-model</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
diff --git a/sli/pom.xml b/sli/pom.xml
index d21a6cfb..b57f80e7 100755
--- a/sli/pom.xml
+++ b/sli/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-core :: sli</name>
diff --git a/sli/provider-base/pom.xml b/sli/provider-base/pom.xml
index 8d59b507..abd33b46 100644
--- a/sli/provider-base/pom.xml
+++ b/sli/provider-base/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.5.2</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
 	<artifactId>sli-provider-base</artifactId>
-	<version>0.7.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 
 	<name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
 
@@ -29,7 +29,6 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.core</groupId>
@@ -61,7 +60,4 @@
 		</dependency>
 
 	</dependencies>
-
-
-
 </project>
diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
index eb3dc27d..5dc327f1 100755
--- a/sli/provider/pom.xml
+++ b/sli/provider/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.5.2</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
 	<artifactId>sli-provider</artifactId>
-	<version>0.7.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 
 	<name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
@@ -21,7 +21,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -31,7 +30,6 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-	
 	<dependencies>
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.core</groupId>
@@ -108,7 +106,6 @@
 						<DynamicImport-Package>*</DynamicImport-Package>
 					</instructions>
 				</configuration>
-
 			</plugin>
 			<!-- Jacoco / Sonar -->
 			<plugin>
@@ -134,7 +131,5 @@
 				</executions>
 			</plugin>
 		</plugins>
-
 	</build>
-
 </project>