From 221f558101ae0a421e621947d62c2199c6cfa5ff Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 31 Mar 2017 13:05:52 +0200 Subject: Bump hc2vpp version to 1.17.04-RC1 Also updates honeycomb dependencies and vpp package dependencies Change-Id: I4527d86b4ebf6e8e8a92c8d62c5a14640802b3e7 Signed-off-by: Marek Gradzki --- acl/acl-api/pom.xml | 4 ++-- acl/acl-impl/pom.xml | 4 ++-- acl/pom.xml | 4 ++-- common/api-parent/pom.xml | 4 ++-- common/hc2vpp-parent/pom.xml | 4 ++-- common/impl-parent/pom.xml | 6 +++--- common/minimal-distribution-parent/pom.xml | 10 +++++----- common/pom.xml | 4 ++-- dhcp/dhcp-api/pom.xml | 4 ++-- dhcp/dhcp-impl/pom.xml | 6 +++--- dhcp/pom.xml | 4 ++-- ioam/api/pom.xml | 4 ++-- ioam/impl/pom.xml | 4 ++-- ioam/pom.xml | 4 ++-- it/api-test/pom.xml | 4 ++-- it/pom.xml | 2 +- l3/api/pom.xml | 4 ++-- l3/impl/pom.xml | 4 ++-- l3/pom.xml | 2 +- l3/utils/pom.xml | 4 ++-- lisp/api/pom.xml | 6 +++--- lisp/lisp2vpp/pom.xml | 4 ++-- lisp/pom.xml | 4 ++-- nat/nat-api/pom.xml | 6 +++--- nat/nat2vpp/pom.xml | 8 ++++---- nat/pom.xml | 4 ++-- nsh/api/pom.xml | 4 ++-- nsh/impl/pom.xml | 4 ++-- nsh/pom.xml | 4 ++-- packaging/deb/common/prepare.sh | 8 ++++---- packaging/deb/common/vpp_dependencies | 2 +- packaging/rpm/honeycomb.spec | 6 +++--- packaging/rpm/release | 4 ++-- packaging/rpm/rpmbuild.sh | 2 +- packaging/rpm/vpp_dependencies | 2 +- pom.xml | 4 ++-- release-notes/pom.xml | 4 ++-- routing/pom.xml | 4 ++-- routing/routing-api/pom.xml | 4 ++-- routing/routing-impl/pom.xml | 4 ++-- samples/pom.xml | 2 +- samples/samples-api/pom.xml | 4 ++-- samples/samples-impl/pom.xml | 4 ++-- v3po/api/pom.xml | 4 ++-- v3po/pom.xml | 4 ++-- v3po/v3po2vpp/pom.xml | 4 ++-- vpp-classifier/api/pom.xml | 4 ++-- vpp-classifier/impl/pom.xml | 6 +++--- vpp-classifier/pom.xml | 2 +- vpp-common/naming-context-api/pom.xml | 4 ++-- vpp-common/naming-context-impl/pom.xml | 4 ++-- vpp-common/pom.xml | 4 ++-- vpp-common/vpp-common-integration/pom.xml | 6 +++--- vpp-common/vpp-impl-parent/pom.xml | 4 ++-- vpp-common/vpp-translate-test/pom.xml | 4 ++-- vpp-common/vpp-translate-utils/pom.xml | 4 ++-- vpp-integration/minimal-distribution/pom.xml | 28 ++++++++++++++-------------- vpp-integration/pom.xml | 4 ++-- vpp-management/api/pom.xml | 4 ++-- vpp-management/impl/pom.xml | 4 ++-- vpp-management/pom.xml | 4 ++-- 61 files changed, 141 insertions(+), 141 deletions(-) diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 8c200ce9d..3269d44a6 100644 --- a/acl/acl-api/pom.xml +++ b/acl/acl-api/pom.xml @@ -16,7 +16,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.acl acl-api acl-api - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index c524a2d59..4dac0fa2f 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -20,14 +20,14 @@ io.fd.hc2vpp.common impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/impl-parent 4.0.0 io.fd.hc2vpp.acl acl-impl - 1.17.04-SNAPSHOT + 1.17.04-RC1 17.04-SNAPSHOT diff --git a/acl/pom.xml b/acl/pom.xml index 14b9e0b40..9e650f4de 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent acl-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 acl-aggregator pom 4.0.0 diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index f1c899b8c..6926c1e04 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../hc2vpp-parent io.fd.hc2vpp.common api-parent ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 pom diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index e44777e99..74f8143ff 100644 --- a/common/hc2vpp-parent/pom.xml +++ b/common/hc2vpp-parent/pom.xml @@ -7,13 +7,13 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 io.fd.hc2vpp.common hc2vpp-parent ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 pom \ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index e51413b1a..a5be6d4f2 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../hc2vpp-parent io.fd.hc2vpp.common impl-parent ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 pom @@ -23,7 +23,7 @@ io.fd.honeycomb.common impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 pom import diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index ff077ef0b..654ec80af 100644 --- a/common/minimal-distribution-parent/pom.xml +++ b/common/minimal-distribution-parent/pom.xml @@ -7,13 +7,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../hc2vpp-parent io.fd.hc2vpp.common minimal-distribution-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ${project.artifactId} pom @@ -29,7 +29,7 @@ io.fd.honeycomb.common minimal-distribution-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 pom import @@ -131,7 +131,7 @@ io.fd.honeycomb.common common-scripts - 1.17.04-SNAPSHOT + 1.17.04-RC1 @@ -144,7 +144,7 @@ io.fd.honeycomb.common minimal-assembly-descriptor - 1.17.04-SNAPSHOT + 1.17.04-RC1 diff --git a/common/pom.xml b/common/pom.xml index 26919e97b..107279df8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 hc2vpp-parent io.fd.hc2vpp.common hc2vpp-common-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 ${project.artifactId} pom Aggregator for common maven parents providing base configuration for Hc2vpp modules diff --git a/dhcp/dhcp-api/pom.xml b/dhcp/dhcp-api/pom.xml index e92df5f2b..b6155ad83 100644 --- a/dhcp/dhcp-api/pom.xml +++ b/dhcp/dhcp-api/pom.xml @@ -16,7 +16,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-api dhcp-api - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 2ede7a520..4a4e5bf1c 100644 --- a/dhcp/dhcp-impl/pom.xml +++ b/dhcp/dhcp-impl/pom.xml @@ -16,7 +16,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../vpp-common/vpp-impl-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-impl dhcp-impl - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle @@ -69,7 +69,7 @@ io.fd.honeycomb translate-impl - 1.17.04-SNAPSHOT + 1.17.04-RC1 diff --git a/dhcp/pom.xml b/dhcp/pom.xml index b9db1b935..c40d78e7f 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent dhcp-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 dhcp-aggregator pom 4.0.0 diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 37d24f151..a3007f280 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 2c061b1a8..3fc497fec 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/impl-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/ioam/pom.xml b/ioam/pom.xml index 1bb703715..b8a649af0 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent io.fd.hc2vpp.ioam vppioam-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 ${project.artifactId} pom 4.0.0 diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index b26c22f7d..5c759dc0b 100644 --- a/it/api-test/pom.xml +++ b/it/api-test/pom.xml @@ -21,13 +21,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/hc2vpp-parent 4.0.0 api-test - 1.17.04-SNAPSHOT + 1.17.04-RC1 diff --git a/it/pom.xml b/it/pom.xml index 2b89d233e..5469a0009 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent 4.0.0 diff --git a/l3/api/pom.xml b/l3/api/pom.xml index 265268aaa..44730ae0d 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent io.fd.hc2vpp.l3 l3-api ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index d57d0cb94..017583250 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-impl ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 diff --git a/l3/pom.xml b/l3/pom.xml index cc8d88670..847e84f13 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent pom diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index 3e9dbc196..f2c90d5c9 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-utils ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index 3be0799c9..2a107aad6 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent @@ -26,12 +26,12 @@ io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle io.fd.honeycomb - 1.17.04-SNAPSHOT + 1.17.04-RC1 diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 62663069d..c4a3d1ac0 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index 0fd7c0355..52ad1766b 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent io.fd.hc2vpp.lisp lisp-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 ${project.artifactId} pom 4.0.0 diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index c29d40010..90f634238 100644 --- a/nat/nat-api/pom.xml +++ b/nat/nat-api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent @@ -25,11 +25,11 @@ io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle - 1.17.04-SNAPSHOT + 1.17.04-RC1 diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 4cd4ab6e4..e282555b5 100644 --- a/nat/nat2vpp/pom.xml +++ b/nat/nat2vpp/pom.xml @@ -18,19 +18,19 @@ io.fd.hc2vpp.common vpp-impl-parent ../../vpp-common/vpp-impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle - 1.17.04-SNAPSHOT - 1.17.04-SNAPSHOT + 1.17.04-RC1 + 1.17.04-RC1 diff --git a/nat/pom.xml b/nat/pom.xml index 3f24e214a..ccae03c02 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent io.fd.hc2vpp.nat nat-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index edc0ef9c5..441719609 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index beefe370b..7754f3a25 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/impl-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/nsh/pom.xml b/nsh/pom.xml index a4584814c..afe0d7bff 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent io.fd.hc2vpp.nsh vppnsh-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index 69d535389..ba2ccb633 100755 --- a/packaging/deb/common/prepare.sh +++ b/packaging/deb/common/prepare.sh @@ -14,9 +14,9 @@ BUILD_DEPENDENCIES=$($5) # Copy and unpack the archive with vpp-integration distribution ARCHIVE_DIR=${SOURCE_DIR}/../../../vpp-integration/minimal-distribution/target/ -ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-RC1-hc.tar.gz cp ${ARCHIVE} ${SOURCE_DIR} -ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz +ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-RC1-hc.tar.gz tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/ # Create packaging root @@ -24,7 +24,7 @@ rm -rf ${BUILD_DIR} mkdir ${BUILD_DIR} # Copy contents of tar.gz -mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${BUILD_DIR}/ +mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-RC1/ ${BUILD_DIR}/ cp -r $2 ${BUILD_DIR} # OS service definition @@ -41,7 +41,7 @@ EOT # Install instructions cat <> ${BUILD_DIR}/debian/install -vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/ +vpp-integration-distribution-${VERSION}-RC1/* /opt/honeycomb/ $3 $4 EOT diff --git a/packaging/deb/common/vpp_dependencies b/packaging/deb/common/vpp_dependencies index 8c1c21617..799376608 100755 --- a/packaging/deb/common/vpp_dependencies +++ b/packaging/deb/common/vpp_dependencies @@ -1,6 +1,6 @@ #!/bin/bash # defines vpp and vpp-plugins dependencies for debian packages # using range -echo "vpp (>= 17.04), vpp (<< 17.07), vpp-plugins (>= 17.04), vpp-plugins (<< 17.07)" +echo "vpp (>= 17.04-rc1), vpp (<< 17.05), vpp-plugins (>= 17.04-rc1), vpp-plugins (<< 17.05)" # or specific vpp version #echo "vpp (= 17.04-rc1), vpp-plugins (= 17.04-rc1)" diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index 3c4e7efde..bb90aad0b 100644 --- a/packaging/rpm/honeycomb.spec +++ b/packaging/rpm/honeycomb.spec @@ -17,7 +17,7 @@ Summary: fd.io Honeycomb Group: Applications/Communications License: Apache-1.0 URL: http://www.fd.io -Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip +Source0: vpp-integration-distribution-%{_version}-RC1-hc.zip Source1: honeycomb.service Requires: %{_vpp_dependencies}, java >= 1:1.8.0 # Required for creating honeycomb group @@ -38,13 +38,13 @@ fd.io Honeycomb %prep # Extract Source0 (Honeycomb archive) -%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT +%autosetup -n vpp-integration-distribution-%{_version}-RC1 %install # Create directory in build root for Honeycomb mkdir -p $RPM_BUILD_ROOT/opt/%name # Copy Honeycomb from archive to its dir in build root -cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-distribution-%{_version}-RC1/* $RPM_BUILD_ROOT/opt/%name # Create directory in build root for systemd .service file mkdir -p $RPM_BUILD_ROOT/%{_unitdir} # Copy Honeycomb's systemd .service file to correct dir in build root diff --git a/packaging/rpm/release b/packaging/rpm/release index 4de82e41c..94011ea03 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,10 +1,10 @@ #!/bin/bash # release version -# echo RELEASE +echo RC1 # # snapshot version # # Increasing the build number by a certain margin. # Necessary due to honeycomb - hc2vpp split. Build_number counter was reset # rewriting older packages -echo $(expr $BUILD_NUMBER + 2000) \ No newline at end of file +# echo $(expr $BUILD_NUMBER + 2000) \ No newline at end of file diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index b50beb436..e1a831470 100755 --- a/packaging/rpm/rpmbuild.sh +++ b/packaging/rpm/rpmbuild.sh @@ -3,7 +3,7 @@ set -xe DIR=$(dirname $0) DIR=$(readlink -f $DIR) ZIPDIR=${DIR}/../../vpp-integration/minimal-distribution/target/ -ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04-SNAPSHOT-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04-RC1-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ diff --git a/packaging/rpm/vpp_dependencies b/packaging/rpm/vpp_dependencies index 5090544b6..485014859 100755 --- a/packaging/rpm/vpp_dependencies +++ b/packaging/rpm/vpp_dependencies @@ -1,6 +1,6 @@ #!/bin/bash # defines vpp and vpp-plugins dependencies for rpm packages # using range -echo "vpp >= 17.04, vpp < 17.07, vpp-plugins >= 17.04, vpp-plugins < 17.07" +echo "vpp >= 17.04-rc1, vpp < 17.05, vpp-plugins >= 17.04-rc1, vpp-plugins < 17.05" # or specific vpp version #echo "vpp = 17.04-rc1, vpp-plugins = 17.04-rc1" diff --git a/pom.xml b/pom.xml index 5e81b158c..74bd62d4b 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 common/hc2vpp-parent io.fd.hc2vpp hc2vpp-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 4a6b76ebe..595c387a9 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent io.fd.hc2vpp release-notes-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 ${project.artifactId} pom 4.0.0 diff --git a/routing/pom.xml b/routing/pom.xml index 468a2ec98..98b16e101 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent io.fd.hc2vpp.routing routing-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index ab084b549..2ce2720f6 100644 --- a/routing/routing-api/pom.xml +++ b/routing/routing-api/pom.xml @@ -18,14 +18,14 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent 4.0.0 io.fd.hc2vpp.routing routing-api - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 88120868f..99c089d9f 100644 --- a/routing/routing-impl/pom.xml +++ b/routing/routing-impl/pom.xml @@ -20,14 +20,14 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.routing routing-impl - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/samples/pom.xml b/samples/pom.xml index 1d5745098..26f538fb3 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent 4.0.0 diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index c78dc6091..c430a4e62 100644 --- a/samples/samples-api/pom.xml +++ b/samples/samples-api/pom.xml @@ -5,7 +5,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent 4.0.0 @@ -13,7 +13,7 @@ io.fd.hc2vpp.common samples-api ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index d4932fd68..36bb0d3b2 100644 --- a/samples/samples-impl/pom.xml +++ b/samples/samples-impl/pom.xml @@ -5,14 +5,14 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../vpp-common/vpp-impl-parent 4.0.0 samples-impl ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 1eca45549..b27e4557c 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index 405d849df..0cd5355a9 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent io.fd.hc2vpp.v3po v3po-aggregator - 1.17.04-SNAPSHOT + 1.17.04-RC1 ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index aa14b42a6..6cb950bbd 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 6bd15a5c8..4a1a87ae7 100644 --- a/vpp-classifier/api/pom.xml +++ b/vpp-classifier/api/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../common/api-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-api ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 bundle diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index 69c06e327..fb251b42b 100644 --- a/vpp-classifier/impl/pom.xml +++ b/vpp-classifier/impl/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../../vpp-common/vpp-impl-parent @@ -30,14 +30,14 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-impl ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 io.fd.hc2vpp.vpp.classifier vpp-classifier-api - 1.17.04-SNAPSHOT + 1.17.04-RC1 diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index e8f5cc445..b3020a21d 100644 --- a/vpp-management/pom.xml +++ b/vpp-management/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04-SNAPSHOT + 1.17.04-RC1 ../common/hc2vpp-parent @@ -31,7 +31,7 @@ io.fd.hc2vpp.management vpp-management-aggregator ${project.artifactId} - 1.17.04-SNAPSHOT + 1.17.04-RC1 Aggregator for Hc2vpp vpp-management plugin -- cgit 1.2.3-korg