Roll master to Guilin

Roll versions of master for early Guilin development

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

10 files changed, 23 insertions, 32 deletions

diff --git a/features/ccsdk-gr-toolkit/pom.xml b/features/ccsdk-gr-toolkit/pom.xml
index 30899041..ceac4105 100644
--- a/features/ccsdk-gr-toolkit/pom.xml
+++ b/features/ccsdk-gr-toolkit/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>ccsdk-gr-toolkit</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
diff --git a/features/ccsdk-properties-node/pom.xml b/features/ccsdk-properties-node/pom.xml
index 2c1ca974..c22b00ae 100644
--- a/features/ccsdk-properties-node/pom.xml
+++ b/features/ccsdk-properties-node/pom.xml
@@ -5,18 +5,17 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>ccsdk-properties-node</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
 
-	
     <dependencies>
 
         
diff --git a/features/ccsdk-restapi-call-node/pom.xml b/features/ccsdk-restapi-call-node/pom.xml
index 3bb1ce31..29111052 100644
--- a/features/ccsdk-restapi-call-node/pom.xml
+++ b/features/ccsdk-restapi-call-node/pom.xml
@@ -5,18 +5,17 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.5.2</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>ccsdk-restapi-call-node</artifactId>
-	<version>0.7.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
 	<name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
 
-
 	<dependencies>
         <dependency>
             <groupId>javax.ws.rs</groupId>
diff --git a/features/ccsdk-restconf-client/pom.xml b/features/ccsdk-restconf-client/pom.xml
index ad001ed1..0fb75b43 100644
--- a/features/ccsdk-restconf-client/pom.xml
+++ b/features/ccsdk-restconf-client/pom.xml
@@ -5,24 +5,21 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.5.2</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>ccsdk-restconf-client</artifactId>
-	<version>0.7.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
+	<name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
+
 	<properties>
 		<skip.karaf.featureTest>true</skip.karaf.featureTest>
 	</properties>
 
-	<name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
-
-
-
-
 	<dependencies>
 
 		
diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml
index 96f1b007..132abd56 100644
--- a/features/ccsdk-sli-plugins-all/pom.xml
+++ b/features/ccsdk-sli-plugins-all/pom.xml
@@ -5,18 +5,17 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.5.2</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>ccsdk-sli-plugins-all</artifactId>
-	<version>0.7.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
 	<name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name>
 
-
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/features/ccsdk-sshapi-call-node/pom.xml b/features/ccsdk-sshapi-call-node/pom.xml
index 5209d49b..5b600563 100644
--- a/features/ccsdk-sshapi-call-node/pom.xml
+++ b/features/ccsdk-sshapi-call-node/pom.xml
@@ -5,20 +5,17 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>ccsdk-sshapi-call-node</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>
-
-
-
-<!--
+    <!--
     <properties>
         <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
     </properties>
diff --git a/features/ccsdk-template-node/pom.xml b/features/ccsdk-template-node/pom.xml
index 8096d276..1b1fae54 100644
--- a/features/ccsdk-template-node/pom.xml
+++ b/features/ccsdk-template-node/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.5.2</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>ccsdk-template-node</artifactId>
-	<version>0.7.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
 	<name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name>
diff --git a/features/features-sli-plugins/pom.xml b/features/features-sli-plugins/pom.xml
index 43bdaedb..1a69cd2d 100644
--- a/features/features-sli-plugins/pom.xml
+++ b/features/features-sli-plugins/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>features-sli-plugins</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name>
diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 23f99d5d..4ac0116c 100755
--- a/features/installer/pom.xml
+++ b/features/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.plugins</groupId>
 	<artifactId>sliplugins-features-installer</artifactId>
-	<version>0.7.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name>
diff --git a/features/pom.xml b/features/pom.xml
index f68c07fb..ba34f0c3 100755
--- a/features/pom.xml
+++ b/features/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.plugins</groupId>
 	<artifactId>sliplugins-feature-aggregator</artifactId>
-	<version>0.7.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-sli-plugins :: features</name>