Prepare for release build

Create release build of CCSDK Dublin on ODL Oxygen prior
to merging Fluorine changes

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

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 3c6763c..b45c353 100644 (file)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -95,11 +95,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.4.0</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 01070ce..e7bb4fb 100644 (file)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -95,11 +95,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.4.0</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 0eb8026..daec670 100644 (file)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -95,11 +95,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.4.0</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 9a07246..32f827a 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.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</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 66a9046..779e64a 100644 (file)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -95,11 +95,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.4.0</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 470b9d8..a5209fa 100644 (file)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -95,11 +95,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.4.0</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 16f0f2a..0889a8a 100644 (file)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -95,11 +95,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.4.0</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/setup/pom.xml b/odlparent/setup/pom.xml
index 0a25a9a..5665a54 100755 (executable)
--- a/odlparent/setup/pom.xml
+++ b/odlparent/setup/pom.xml
@@ -12,9 +12,8 @@
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>parent</artifactId>
+               <artifactId>odlparent-aggregator</artifactId>
                <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
        </parent>
 
 

diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 57df611..dedb0f0 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -95,11 +95,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.4.0</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 dedce60..15c5330 100644 (file)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -95,11 +95,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.4.0</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/springboot1/pom.xml b/springboot/springboot1/pom.xml
index d15a8c5..37c7f3f 100755 (executable)
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -82,11 +82,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.4.0</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 915fec8..2bf5d30 100755 (executable)
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -82,11 +82,11 @@
 
 
                <!-- CCSDK component versions -->
-               <ccsdk.sli.core.version>0.4.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.4.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.4.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.4.0-SNAPSHOT</ccsdk.sli.plugins.version>
-               <ccsdk.distribution.version>0.4.0-SNAPSHOT</ccsdk.distribution.version>
+               <ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
+               <ccsdk.distribution.version>0.4.0</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/tools/updParentVersion.sh b/tools/updParentVersion.sh
new file mode 100755 (executable)
index 0000000..8740a89
--- /dev/null
+++ b/tools/updParentVersion.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+updatePom() {
+cat $1 | xsltproc -o $1 /tmp/rebase-pom.xslt -
+}
+
+export -f updatePom
+
+# Create XSLT script
+newVersion=$2
+echo "newVersion is $newVersion"
+cat <<END > /tmp/rebase-pom.xslt
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:pom="http://maven.apache.org/POM/4.0.0"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    exclude-result-prefixes="pom">
+    <xsl:output method="xml" encoding="UTF-8" indent="yes" omit-xml-declaration="no"/>
+
+    <!-- Copy everything that does not match a rewrite rule -->
+    <xsl:template match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()" />
+        </xsl:copy>
+    </xsl:template>
+
+    <!-- Change ccsdk parent pom version -->
+    <xsl:template match="//pom:parent[pom:groupId='org.onap.ccsdk.parent']/pom:version">
+       <version>$newVersion</version>
+    </xsl:template>
+</xsl:stylesheet>
+END
+
+if [ $# -ne 2 ]
+then
+       echo "Usage: $0 <directory> <version>"
+       exit 1
+fi
+
+find $1 -name pom.xml -exec bash -c 'updatePom "$0" $1' '{}' \;

diff --git a/version.properties b/version.properties
index b0f5a7e..2408189 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -10,6 +10,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