Prepare to create RC0 release version

Update parent poms in preparation to create version 1.1.1

Change-Id: I5206622dcbf43b94409cfe0faf87f5f0e7157868
Issue-ID: CCSDK-617
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index a6f15d5..3a0e61b 100755 (executable)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -88,11 +88,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.3.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.3.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.3.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.3.1-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.3.1</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.3.1</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.3.1</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.3.1</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.3.1</ccsdk.distribution.version>
                <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
                <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
                <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>

diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 9411f7e..a2dc9b2 100755 (executable)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -88,11 +88,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.3.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.3.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.3.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.3.1-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.3.1</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.3.1</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.3.1</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.3.1</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.3.1</ccsdk.distribution.version>
                <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
                <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
                <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>

diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 2831a3c..3617847 100755 (executable)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -88,11 +88,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.3.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.3.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.3.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.3.1-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.3.1</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.3.1</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.3.1</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.3.1</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.3.1</ccsdk.distribution.version>
                <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
                <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
                <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>

diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index f95d08c..51797c2 100755 (executable)
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -88,10 +88,10 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.3.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.3.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.3.1-SNAPSHOT</ccsdk.sli.plugins.version>
+               <ccsdk.sli.core.version>0.3.1</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.3.1</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.3.1</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.3.1</ccsdk.sli.plugins.version>
                <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
                <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
                <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 2f1ab9a..3e2300a 100755 (executable)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -88,11 +88,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.3.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.3.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.3.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.3.1-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.3.1</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.3.1</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.3.1</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.3.1</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.3.1</ccsdk.distribution.version>
                <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
                <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
                <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>

diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 93a2da8..663880e 100755 (executable)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -88,11 +88,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.3.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.3.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.3.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.3.1-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.3.1</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.3.1</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.3.1</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.3.1</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.3.1</ccsdk.distribution.version>
                <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
                <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
                <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 3dcbcd1..70dd6fd 100755 (executable)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -88,11 +88,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.3.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.3.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.3.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.3.1-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.3.1</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.3.1</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.3.1</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.3.1</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.3.1</ccsdk.distribution.version>
                <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
                <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
                <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>

diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 57ada22..60b3789 100755 (executable)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -88,11 +88,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.3.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.3.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.3.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.3.1-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.3.1</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.3.1</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.3.1</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.3.1</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.3.1</ccsdk.distribution.version>
                <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
                <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
                <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
@@ -181,8 +181,7 @@
 
                <tomcat-jdbc.version>8.5.14</tomcat-jdbc.version>
 
-               <!-- Late in release, need to disable SingleFeatureTest, since it will 
-                       fail if any dependencies are released ONAP artifacts <skip.karaf.featureTest>true</skip.karaf.featureTest> -->
+               <skip.karaf.featureTest>true</skip.karaf.featureTest>
        </properties>
 
 

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index e3e21b8..d9a2eeb 100755 (executable)
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -82,11 +82,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.3.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.3.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.3.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.3.1-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.3.1</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.3.1</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.3.1</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.3.1</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.3.1</ccsdk.distribution.version>
                <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
                <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
                <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>

diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 7de3866..65b54e2 100755 (executable)
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -82,11 +82,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.3.1-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.3.1-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.3.1-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.3.1-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.3.1</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.3.1</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.3.1</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.3.1</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.3.1</ccsdk.distribution.version>
                <sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
                <sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
                <sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>

diff --git a/version.properties b/version.properties
index c164de8..ca85875 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -10,6 +10,6 @@ feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
-release_version=${base_version}-STAGING
+release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT