From: Timoney, Dan (dt5972) Date: Tue, 5 Jun 2018 17:27:30 +0000 (-0400) Subject: Roll version for Casablanca dev start X-Git-Tag: 1.1.0~16 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=adcb084eebd8ac12837c16ebf58b753fac5864d7;p=ccsdk%2Fparent.git Roll version for Casablanca dev start Update versions of master ccsdk/parent for Casablanca development. Also, updated version.properties file to add '-STAGING' to version for release, to avoid conflict with true release version. Change-Id: Ie8d00868f9ec1c008740c22dcd93c1a139635275 Issue-ID: CCSDK-295 Signed-off-by: Timoney, Dan (dt5972) --- diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 146fb2b2..2cc6ce10 100755 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent binding-parent - 1.0.4-SNAPSHOT + 1.1.0-SNAPSHOT org.opendaylight.mdsal diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index ddb34e4d..2f268656 100755 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent bundle-parent - 1.0.4-SNAPSHOT + 1.1.0-SNAPSHOT org.opendaylight.odlparent diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 402e30c9..0e9427bc 100755 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent feature-repo-parent - 1.0.4-SNAPSHOT + 1.1.0-SNAPSHOT org.opendaylight.odlparent diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 014008b9..0c5e4c37 100755 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent mdsal-it-parent - 1.0.4-SNAPSHOT + 1.1.0-SNAPSHOT org.opendaylight.controller diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 19a345cc..7c74b789 100755 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent odlparent-lite - 1.0.4-SNAPSHOT + 1.1.0-SNAPSHOT org.opendaylight.odlparent diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index f4ee826b..ccd3ec32 100755 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent odlparent - 1.0.4-SNAPSHOT + 1.1.0-SNAPSHOT org.opendaylight.odlparent diff --git a/odlparent/pom.xml b/odlparent/pom.xml index f306129d..b4c08917 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent odlparent-aggregator - 1.0.4-SNAPSHOT + 1.1.0-SNAPSHOT org.onap.ccsdk.parent parent - 1.0.4-SNAPSHOT + 1.1.0-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index e2a5ef51..c40b985e 100755 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent single-feature-parent - 1.0.4-SNAPSHOT + 1.1.0-SNAPSHOT org.opendaylight.odlparent diff --git a/pom.xml b/pom.xml index a71d7ba6..bd4c39ee 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent parent - 1.0.4-SNAPSHOT + 1.1.0-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/version.properties b/version.properties index 65f3df12..60a8d1ca 100644 --- a/version.properties +++ b/version.properties @@ -5,11 +5,11 @@ release_name=1 -sprint_number=0 -feature_revision=4 +sprint_number=1 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -release_version=${base_version} +release_version=${base_version}-STAGING snapshot_version=${base_version}-SNAPSHOT