From a612cdd3fbed35c4d5b454c6f0329fa6ecec22e1 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 5 Mar 2020 11:51:01 -0500
Subject: Roll master to Guilin

Roll versions of master for early Guilin development

Change-Id: Id725abd9ecb3c67b2687e15286cb2f2bcd50be1a
Issue-ID: CCSDK-2152
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 resource-assignment/installer/pom.xml |  4 ++--
 resource-assignment/pom.xml           |  6 ++----
 resource-assignment/provider/pom.xml  | 20 ++++++++------------
 3 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'resource-assignment')

diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml
index 2dce577c6..ebfc5e518 100755
--- a/resource-assignment/installer/pom.xml
+++ b/resource-assignment/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.adaptors</groupId>
     <artifactId>resource-assignment-installer</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml
index e1eff0029..3c3fab354 100755
--- a/resource-assignment/pom.xml
+++ b/resource-assignment/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.adaptors</groupId>
     <artifactId>resource-assignment</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-adaptors :: resource-assignment</name>
@@ -21,6 +21,4 @@
         <module>provider</module>
         <module>installer</module>
     </modules>
-
-
 </project>
diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml
index 862370886..cc6043a70 100755
--- a/resource-assignment/provider/pom.xml
+++ b/resource-assignment/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.adaptors</groupId>
     <artifactId>resource-assignment-provider</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
@@ -22,20 +22,18 @@
         <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
     </properties>
-    
+
     <dependencyManagement>
     	<dependencies>
     		<dependency>
-    			<groupId>org.onap.ccsdk.sli.core</groupId>
-    			<artifactId>sli-core-artifacts</artifactId>
-    			<version>${ccsdk.sli.core.version}</version>
-    			<type>pom</type>
-    			<scope>import</scope>
+  <groupId>org.onap.ccsdk.sli.core</groupId>
+  <artifactId>sli-core-artifacts</artifactId>
+  <version>${ccsdk.sli.core.version}</version>
+  <type>pom</type>
+  <scope>import</scope>
     		</dependency>
     	</dependencies>
     </dependencyManagement>
-    
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -91,6 +89,4 @@
             <artifactId>spring-jdbc</artifactId>
         </dependency>
     </dependencies>
-
-
 </project>
-- 
cgit 1.2.3-korg