From d00cb60e14581d0596cd326bdfb45cb5cea94e28 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Tue, 25 Sep 2018 19:51:37 -0400
Subject: Prepare for release version

Update to use released parent pom and remove -STAGING from release
version.

Change-Id: I41fbd91a0ccddf9386ac9985d6272d952c5f80ed
Issue-ID: CCSDK-597
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---
 resource-assignment/features/ccsdk-resource-assignment/pom.xml    | 7 ++++++-
 resource-assignment/features/features-resource-assignment/pom.xml | 2 +-
 resource-assignment/features/pom.xml                              | 2 +-
 resource-assignment/installer/pom.xml                             | 2 +-
 resource-assignment/pom.xml                                       | 2 +-
 resource-assignment/provider/pom.xml                              | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'resource-assignment')

diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml
index 509620f38..e132127ff 100644
--- a/resource-assignment/features/ccsdk-resource-assignment/pom.xml
+++ b/resource-assignment/features/ccsdk-resource-assignment/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath />
     </parent>
 
@@ -16,6 +16,11 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId}</name>
+
+        <properties>
+            <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        </properties>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
diff --git a/resource-assignment/features/features-resource-assignment/pom.xml b/resource-assignment/features/features-resource-assignment/pom.xml
index 8b08563cd..2b11c7aa8 100755
--- a/resource-assignment/features/features-resource-assignment/pom.xml
+++ b/resource-assignment/features/features-resource-assignment/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath />
     </parent>
 
diff --git a/resource-assignment/features/pom.xml b/resource-assignment/features/pom.xml
index 4ded5a1fa..9a6a7e5eb 100755
--- a/resource-assignment/features/pom.xml
+++ b/resource-assignment/features/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath />
     </parent>
 
diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml
index 40e7bce69..19ed1b198 100755
--- a/resource-assignment/installer/pom.xml
+++ b/resource-assignment/installer/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath />
     </parent>
 
diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml
index 746a44747..7233b49fa 100755
--- a/resource-assignment/pom.xml
+++ b/resource-assignment/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath />
     </parent>
 
diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml
index 5f6e54f94..0361c26cb 100755
--- a/resource-assignment/provider/pom.xml
+++ b/resource-assignment/provider/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath />
     </parent>
 
-- 
cgit 1.2.3-korg