diff options
author | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-01-07 15:29:18 -0500 |
---|---|---|
committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-01-07 15:46:37 -0500 |
commit | 0d2d7360df46a4baad1ef553a5248677c7a0d542 (patch) | |
tree | c4a0770fb94244bc95e44247af717de3beb8103c | |
parent | 38d2d6a121d00d49d989cabf7ec5844625ed4ffe (diff) |
Prepare for release build1.2.0
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>
-rw-r--r-- | odlparent/binding-parent/pom.xml | 10 | ||||
-rw-r--r-- | odlparent/bundle-parent/pom.xml | 10 | ||||
-rw-r--r-- | odlparent/feature-repo-parent/pom.xml | 10 | ||||
-rwxr-xr-x | odlparent/karaf4-parent/pom.xml | 8 | ||||
-rw-r--r-- | odlparent/mdsal-it-parent/pom.xml | 10 | ||||
-rw-r--r-- | odlparent/odlparent-lite/pom.xml | 10 | ||||
-rw-r--r-- | odlparent/odlparent/pom.xml | 10 | ||||
-rwxr-xr-x | odlparent/setup/pom.xml | 3 | ||||
-rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 10 | ||||
-rw-r--r-- | odlparent/single-feature-parent/pom.xml | 10 | ||||
-rwxr-xr-x | springboot/springboot1/pom.xml | 10 | ||||
-rwxr-xr-x | springboot/springboot2/pom.xml | 10 | ||||
-rwxr-xr-x | tools/updParentVersion.sh | 41 | ||||
-rw-r--r-- | version.properties | 2 |
14 files changed, 97 insertions, 57 deletions
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 @@ <!-- 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 01070ce8..e7bb4fb7 100644 --- 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 0eb8026d..daec6709 100644 --- 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 9a072463..32f827a8 100755 --- 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 66a90463..779e64ac 100644 --- 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 470b9d88..a5209fab 100644 --- 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 16f0f2a1..0889a8a9 100644 --- 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 0a25a9a9..5665a545 100755 --- 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 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 @@ <!-- 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 dedce606..15c5330b 100644 --- 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 d15a8c5f..37c7f3f0 100755 --- 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 915fec8a..2bf5d301 100755 --- 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 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 <<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 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 |