From 0d2d7360df46a4baad1ef553a5248677c7a0d542 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Mon, 7 Jan 2019 15:29:18 -0500 Subject: 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) --- odlparent/binding-parent/pom.xml | 10 +++--- odlparent/bundle-parent/pom.xml | 10 +++--- odlparent/feature-repo-parent/pom.xml | 10 +++--- odlparent/karaf4-parent/pom.xml | 8 ++--- odlparent/mdsal-it-parent/pom.xml | 10 +++--- odlparent/odlparent-lite/pom.xml | 10 +++--- odlparent/odlparent/pom.xml | 10 +++--- odlparent/setup/pom.xml | 3 +- .../setup/src/main/resources/pom-template.xml | 10 +++--- odlparent/single-feature-parent/pom.xml | 10 +++--- springboot/springboot1/pom.xml | 10 +++--- springboot/springboot2/pom.xml | 10 +++--- tools/updParentVersion.sh | 41 ++++++++++++++++++++++ version.properties | 2 +- 14 files changed, 97 insertions(+), 57 deletions(-) create mode 100755 tools/updParentVersion.sh diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 3c6763ce..b45c353f 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -95,11 +95,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 01070ce8..e7bb4fb7 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -95,11 +95,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 0eb8026d..daec6709 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -95,11 +95,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 9a072463..32f827a8 100755 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -88,10 +88,10 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 66a90463..779e64ac 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -95,11 +95,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 470b9d88..a5209fab 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -95,11 +95,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 16f0f2a1..0889a8a9 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -95,11 +95,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index 0a25a9a9..5665a545 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -12,9 +12,8 @@ org.onap.ccsdk.parent - parent + odlparent-aggregator 1.2.0-SNAPSHOT - diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 57df611a..dedb0f04 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -95,11 +95,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 \${ccsdk.sli.core.version} \${ccsdk.sli.adaptors.version} \${ccsdk.sli.core.version} diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index dedce606..15c5330b 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -95,11 +95,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index d15a8c5f..37c7f3f0 100755 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -82,11 +82,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 915fec8a..2bf5d301 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -82,11 +82,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 + 0.4.0 ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/tools/updParentVersion.sh b/tools/updParentVersion.sh new file mode 100755 index 00000000..8740a89c --- /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 < /tmp/rebase-pom.xslt + + + + + + + + + + + + + + $newVersion + + +END + +if [ $# -ne 2 ] +then + echo "Usage: $0 " + exit 1 +fi + +find $1 -name pom.xml -exec bash -c 'updatePom "$0" $1' '{}' \; diff --git a/version.properties b/version.properties index b0f5a7e6..24081890 100644 --- 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 -- cgit 1.2.3-korg