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>

diff --git a/aai-service/features/ccsdk-aai-service/pom.xml b/aai-service/features/ccsdk-aai-service/pom.xml
index f277788..f7743f0 100644 (file)
--- a/aai-service/features/ccsdk-aai-service/pom.xml
+++ b/aai-service/features/ccsdk-aai-service/pom.xml
@@ -7,7 +7,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>
 
@@ -17,6 +17,11 @@
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
+
+        <properties>
+            <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        </properties>
+
        <dependencyManagement>
                <dependencies>
                        <dependency>

diff --git a/aai-service/features/features-aai-service/pom.xml b/aai-service/features/features-aai-service/pom.xml
index 3a38d79..eb9e7c6 100755 (executable)
--- a/aai-service/features/features-aai-service/pom.xml
+++ b/aai-service/features/features-aai-service/pom.xml
@@ -5,7 +5,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/aai-service/features/pom.xml b/aai-service/features/pom.xml
index 63c5e17..c720486 100755 (executable)
--- a/aai-service/features/pom.xml
+++ b/aai-service/features/pom.xml
@@ -5,7 +5,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/aai-service/installer/pom.xml b/aai-service/installer/pom.xml
index 1e951f8..ae160f2 100755 (executable)
--- a/aai-service/installer/pom.xml
+++ b/aai-service/installer/pom.xml
@@ -5,7 +5,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/aai-service/pom.xml b/aai-service/pom.xml
index 9a94363..a721b6c 100755 (executable)
--- a/aai-service/pom.xml
+++ b/aai-service/pom.xml
@@ -5,7 +5,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/aai-service/provider/pom.xml b/aai-service/provider/pom.xml
index 0324ab3..3be83b8 100755 (executable)
--- a/aai-service/provider/pom.xml
+++ b/aai-service/provider/pom.xml
@@ -7,7 +7,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>
 

diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml
index ae5d9a1..18f3775 100644 (file)
--- a/ansible-adapter/ansible-adapter-bundle/pom.xml
+++ b/ansible-adapter/ansible-adapter-bundle/pom.xml
@@ -17,7 +17,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>
 

diff --git a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
index 5c67480..ebfe087 100644 (file)
--- a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
+++ b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
@@ -5,7 +5,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>
 
@@ -15,6 +15,11 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId}</name>
+
+        <properties>
+            <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        </properties>
+
        <dependencyManagement>
                <dependencies>
                        <dependency>

diff --git a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
index 55a42e9..52afb65 100755 (executable)
--- a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
+++ b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml
@@ -5,7 +5,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/ansible-adapter/ansible-adapter-features/pom.xml b/ansible-adapter/ansible-adapter-features/pom.xml
index a40e70d..d7c35e7 100644 (file)
--- a/ansible-adapter/ansible-adapter-features/pom.xml
+++ b/ansible-adapter/ansible-adapter-features/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>odlparent-lite</artifactId>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml
index 02262ac..f4113d2 100644 (file)
--- a/ansible-adapter/ansible-adapter-installer/pom.xml
+++ b/ansible-adapter/ansible-adapter-installer/pom.xml
@@ -27,7 +27,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>
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/ansible-adapter/pom.xml b/ansible-adapter/pom.xml
index fb2b83a..9d5b425 100644 (file)
--- a/ansible-adapter/pom.xml
+++ b/ansible-adapter/pom.xml
@@ -28,7 +28,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/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml
index 64bc260..6091e1d 100644 (file)
--- a/features/ccsdk-sli-adaptors-all/pom.xml
+++ b/features/ccsdk-sli-adaptors-all/pom.xml
@@ -7,7 +7,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>
 
@@ -17,6 +17,11 @@
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name>
+
+        <properties>
+            <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        </properties>
+
        <dependencyManagement>
                <dependencies>
                        <dependency>
@@ -33,6 +38,11 @@
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
+                        <dependency>
+                            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+                            <artifactId>aai-service-provider</artifactId>
+                            <version>${project.version}</version>
+                        </dependency>
                </dependencies>
        </dependencyManagement>
 

diff --git a/features/features-sli-adaptors/pom.xml b/features/features-sli-adaptors/pom.xml
index de1b9b8..28c71bc 100644 (file)
--- a/features/features-sli-adaptors/pom.xml
+++ b/features/features-sli-adaptors/pom.xml
@@ -5,7 +5,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/features/installer/pom.xml b/features/installer/pom.xml
index be20d9f..47a4c8a 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/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/features/pom.xml b/features/pom.xml
index 5fb7be0..e254970 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,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/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml
index 5c4ed4c..ce1c19c 100644 (file)
--- a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml
+++ b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml
@@ -7,7 +7,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>
 
@@ -17,6 +17,11 @@
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId}</name>
+
+        <properties>
+            <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        </properties>
+
        <dependencyManagement>
                <dependencies>
                        <dependency>

diff --git a/mdsal-resource/features/features-mdsal-resource/pom.xml b/mdsal-resource/features/features-mdsal-resource/pom.xml
index 0b4e7c8..2d32623 100755 (executable)
--- a/mdsal-resource/features/features-mdsal-resource/pom.xml
+++ b/mdsal-resource/features/features-mdsal-resource/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/mdsal-resource/features/pom.xml b/mdsal-resource/features/pom.xml
index 051bd80..2a2eda0 100755 (executable)
--- a/mdsal-resource/features/pom.xml
+++ b/mdsal-resource/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/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml
index b4203b2..534a976 100755 (executable)
--- a/mdsal-resource/installer/pom.xml
+++ b/mdsal-resource/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/mdsal-resource/pom.xml b/mdsal-resource/pom.xml
index 003e8bb..260dcad 100755 (executable)
--- a/mdsal-resource/pom.xml
+++ b/mdsal-resource/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/mdsal-resource/provider/pom.xml b/mdsal-resource/provider/pom.xml
index 94dc3ab..52c0abc 100755 (executable)
--- a/mdsal-resource/provider/pom.xml
+++ b/mdsal-resource/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>
 

diff --git a/netbox-client/features/ccsdk-netbox-client/pom.xml b/netbox-client/features/ccsdk-netbox-client/pom.xml
index e2f0bb2..9087ec9 100644 (file)
--- a/netbox-client/features/ccsdk-netbox-client/pom.xml
+++ b/netbox-client/features/ccsdk-netbox-client/pom.xml
@@ -21,7 +21,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>
 
@@ -32,6 +32,11 @@
 
     <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
 
+        <properties>
+            <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        </properties>
+
+
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/netbox-client/features/features-netbox-client/pom.xml b/netbox-client/features/features-netbox-client/pom.xml
index f775d6c..2f6be0f 100755 (executable)
--- a/netbox-client/features/features-netbox-client/pom.xml
+++ b/netbox-client/features/features-netbox-client/pom.xml
@@ -21,7 +21,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/netbox-client/features/pom.xml b/netbox-client/features/pom.xml
index df5c3e1..8147ee1 100755 (executable)
--- a/netbox-client/features/pom.xml
+++ b/netbox-client/features/pom.xml
@@ -21,7 +21,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/netbox-client/installer/pom.xml b/netbox-client/installer/pom.xml
index 04ab0ed..acb1dfa 100755 (executable)
--- a/netbox-client/installer/pom.xml
+++ b/netbox-client/installer/pom.xml
@@ -21,7 +21,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/netbox-client/pom.xml b/netbox-client/pom.xml
index d16f057..f626611 100644 (file)
--- a/netbox-client/pom.xml
+++ b/netbox-client/pom.xml
@@ -20,7 +20,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/netbox-client/provider/pom.xml b/netbox-client/provider/pom.xml
index e4e2246..2c677b9 100644 (file)
--- a/netbox-client/provider/pom.xml
+++ b/netbox-client/provider/pom.xml
@@ -21,7 +21,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>
 

diff --git a/pom.xml b/pom.xml
index 9f650c0..b702759 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml
index 509620f..e132127 100644 (file)
--- 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 8b08563..2b11c7a 100755 (executable)
--- 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 4ded5a1..9a6a7e5 100755 (executable)
--- 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 40e7bce..19ed1b1 100755 (executable)
--- 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 746a447..7233b49 100755 (executable)
--- 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 5f6e54f..0361c26 100755 (executable)
--- 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>
 

diff --git a/saltstack-adapter/pom.xml b/saltstack-adapter/pom.xml
index b216db5..ff18f5f 100644 (file)
--- a/saltstack-adapter/pom.xml
+++ b/saltstack-adapter/pom.xml
@@ -30,7 +30,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/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
index bdcb052..a7adac3 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
@@ -7,7 +7,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>
 

diff --git a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml
index 703949c..b70aeda 100755 (executable)
--- a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml
@@ -7,7 +7,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/saltstack-adapter/saltstack-adapter-features/pom.xml b/saltstack-adapter/saltstack-adapter-features/pom.xml
index 7f78859..3e5c58d 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-features/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>odlparent-lite</artifactId>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml
index db72000..787983b 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-installer/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml
@@ -29,7 +29,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>
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml
index 4c7646d..4a21ee0 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-provider/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml
@@ -18,7 +18,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>
 

diff --git a/sql-resource/features/ccsdk-sql-resource/pom.xml b/sql-resource/features/ccsdk-sql-resource/pom.xml
index f96a724..94b66f7 100644 (file)
--- a/sql-resource/features/ccsdk-sql-resource/pom.xml
+++ b/sql-resource/features/ccsdk-sql-resource/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 :: sql-resource :: ${project.artifactId}</name>
+
+        <properties>
+            <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        </properties>
+
        <dependencyManagement>
                <dependencies>
                        <dependency>

diff --git a/sql-resource/features/features-sql-resource/pom.xml b/sql-resource/features/features-sql-resource/pom.xml
index 000f878..8e1074b 100755 (executable)
--- a/sql-resource/features/features-sql-resource/pom.xml
+++ b/sql-resource/features/features-sql-resource/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/sql-resource/features/pom.xml b/sql-resource/features/pom.xml
index 4a99dc1..2d34960 100755 (executable)
--- a/sql-resource/features/pom.xml
+++ b/sql-resource/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/sql-resource/installer/pom.xml b/sql-resource/installer/pom.xml
index fff8559..09c4ca1 100755 (executable)
--- a/sql-resource/installer/pom.xml
+++ b/sql-resource/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/sql-resource/pom.xml b/sql-resource/pom.xml
index 13c365c..538c6be 100755 (executable)
--- a/sql-resource/pom.xml
+++ b/sql-resource/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/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml
index 2e26088..67fc93b 100755 (executable)
--- a/sql-resource/provider/pom.xml
+++ b/sql-resource/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>
 

diff --git a/version.properties b/version.properties
index f9fd335..8814893 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -9,6 +9,6 @@ feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
-release_version=${base_version}-STAGING
+release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT