From 49d72f953c34331427e45b6a8e7337ba0b8bceaa Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 2 May 2017 08:00:30 +0200 Subject: Set hc2vpp version to 1.17.04.1-SNAPSHOT Follows vpp's & honeycomb's development cycle. Requires https://gerrit.fd.io/r/#/c/6543/ Change-Id: I91e5a08b3223e270e260ab8ece7e68179f8d2d31 Signed-off-by: Marek Gradzki --- acl/acl-api/pom.xml | 4 ++-- acl/acl-impl/pom.xml | 6 +++--- 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 | 8 ++++---- ioam/pom.xml | 4 ++-- it/api-test/pom.xml | 4 ++-- it/pom.xml | 2 +- jvpp-version | 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 | 10 +++++----- nat/pom.xml | 4 ++-- nsh/api/pom.xml | 4 ++-- nsh/impl/pom.xml | 8 ++++---- nsh/pom.xml | 4 ++-- packaging/deb/common/prepare.sh | 8 ++++---- packaging/rpm/honeycomb.spec | 6 +++--- packaging/rpm/release | 4 ++-- packaging/rpm/rpmbuild.sh | 2 +- packaging/rpm/version | 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 | 8 ++++---- vpp-common/vpp-impl-parent/pom.xml | 6 +++--- 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 ++-- vpp-version | 2 +- 62 files changed, 150 insertions(+), 150 deletions(-) diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 6f5a24c55..3ec956a3a 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 + 1.17.04.1-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.acl acl-api acl-api - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index ba8c3a6ed..f02de302e 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -20,17 +20,17 @@ io.fd.hc2vpp.common impl-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.acl acl-impl - 1.17.04 + 1.17.04.1-SNAPSHOT - 17.04 + 17.04-SNAPSHOT diff --git a/acl/pom.xml b/acl/pom.xml index 3ec7f6579..bf00cde95 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent acl-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT acl-aggregator pom 4.0.0 diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index dce23a1be..30d59cf51 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 + 1.17.04.1-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common api-parent ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT pom diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index 865c5334a..0ea75be17 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 + 1.17.04.1-SNAPSHOT io.fd.hc2vpp.common hc2vpp-parent ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT pom \ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index b9ed54c3b..e7ca6d784 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 + 1.17.04.1-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common impl-parent ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT pom @@ -23,7 +23,7 @@ io.fd.honeycomb.common impl-parent - ${project.version} + 1.17.04.1-SNAPSHOT pom import diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 0677a3b9e..da8af7329 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 + 1.17.04.1-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common minimal-distribution-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ${project.artifactId} pom @@ -29,7 +29,7 @@ io.fd.honeycomb.common minimal-distribution-parent - ${project.version} + 1.17.04.1-SNAPSHOT pom import @@ -131,7 +131,7 @@ io.fd.honeycomb.common common-scripts - ${project.version} + 1.17.04.1-SNAPSHOT @@ -144,7 +144,7 @@ io.fd.honeycomb.common minimal-assembly-descriptor - ${project.version} + 1.17.04.1-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 50ed9cd32..3a335d95a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT hc2vpp-parent io.fd.hc2vpp.common hc2vpp-common-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT ${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 9ed855599..3fe889780 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 + 1.17.04.1-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-api dhcp-api - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 4c3cea91c..d4aaee4e7 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 + 1.17.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-impl dhcp-impl - 1.17.04 + 1.17.04.1-SNAPSHOT bundle @@ -69,7 +69,7 @@ io.fd.honeycomb translate-impl - ${project.version} + 1.17.04.1-SNAPSHOT diff --git a/dhcp/pom.xml b/dhcp/pom.xml index f18168200..79d55db4c 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent dhcp-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT dhcp-aggregator pom 4.0.0 diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index f594d89c6..e6c496bff 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 6552d1529..26ff85e64 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../../common/impl-parent @@ -26,12 +26,12 @@ io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle - 17.04 - 17.04 + 17.04-SNAPSHOT + 17.04-SNAPSHOT diff --git a/ioam/pom.xml b/ioam/pom.xml index 710d0f33a..a9df157c4 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.ioam vppioam-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index 0d361ee78..348908b4b 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 + 1.17.04.1-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 api-test - 1.17.04 + 1.17.04.1-SNAPSHOT ${project.artifactId} diff --git a/it/pom.xml b/it/pom.xml index 538add218..5426199a8 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/jvpp-version b/jvpp-version index cde36c554..416238ec3 100755 --- a/jvpp-version +++ b/jvpp-version @@ -1,2 +1,2 @@ #!/bin/sh -echo 17.04 +echo 17.04-SNAPSHOT diff --git a/l3/api/pom.xml b/l3/api/pom.xml index 9abb824d4..9ca63eaa8 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ io.fd.hc2vpp.common api-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.l3 l3-api ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index ac582d390..0a8f41d44 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 + 1.17.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-impl ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT diff --git a/l3/pom.xml b/l3/pom.xml index 2f9558bcf..f7acd837e 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent pom diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index cf96f209e..54c63defd 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 + 1.17.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-utils ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index a44db6729..a2f252a44 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../../common/api-parent @@ -26,12 +26,12 @@ io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle io.fd.honeycomb - 1.17.04 + 1.17.04.1-SNAPSHOT diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 7ee035c69..7ba45754b 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 + 1.17.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index b273d5f6e..475f1880e 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.lisp lisp-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index a1b458e7f..794cd49f2 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 + 1.17.04.1-SNAPSHOT ../../common/api-parent @@ -25,11 +25,11 @@ io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle - 1.17.04 + 1.17.04.1-SNAPSHOT diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 60a6785d7..d827c3c74 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 + 1.17.04.1-SNAPSHOT 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle - 1.17.04 - 1.17.04 + 1.17.04.1-SNAPSHOT + 1.17.04.1-SNAPSHOT @@ -54,7 +54,7 @@ io.fd.vpp jvpp-snat - 17.04 + 17.04-SNAPSHOT diff --git a/nat/pom.xml b/nat/pom.xml index 40fb7baf6..f921948ae 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nat nat-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index c398eeb5f..86bd79d00 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index ddb9acb32..7d755c10e 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../../common/impl-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle @@ -89,12 +89,12 @@ io.fd.vpp jvpp-registry - 17.04 + 17.04-SNAPSHOT io.fd.nsh_sfc nsh-sfc - 17.04 + 17.04-SNAPSHOT io.fd.hc2vpp.common diff --git a/nsh/pom.xml b/nsh/pom.xml index 83161f6d1..491c052b7 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nsh vppnsh-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index a23832cec..69d535389 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}-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz cp ${ARCHIVE} ${SOURCE_DIR} -ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-hc.tar.gz +ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-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}/ ${BUILD_DIR}/ +mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${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}/* /opt/honeycomb/ +vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/ $3 $4 EOT diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index d759d8bb7..3c4e7efde 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}-hc.zip +Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-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} +%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT %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}/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $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 86a2f4dc4..4de82e41c 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,10 +1,10 @@ #!/bin/bash # release version -echo RELEASE +# echo RELEASE # # 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 fbe2ab22d..3af99961d 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-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04.1-SNAPSHOT-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ diff --git a/packaging/rpm/version b/packaging/rpm/version index f0bea456b..a05c531a0 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.17.04 +echo 1.17.04.1 diff --git a/pom.xml b/pom.xml index 3e45867af..538a5d98c 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT common/hc2vpp-parent io.fd.hc2vpp hc2vpp-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 02a44976a..8e8f9d530 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp release-notes-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/pom.xml b/routing/pom.xml index 41a1181e4..4882a08ec 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.routing routing-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index 8349d2088..2721c8382 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 + 1.17.04.1-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.routing routing-api - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index a19d124fd..4d7525d43 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 + 1.17.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.routing routing-impl - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/samples/pom.xml b/samples/pom.xml index b8b56d00d..abe1f794c 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index e664c46dd..1d4325419 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 + 1.17.04.1-SNAPSHOT ../../common/api-parent 4.0.0 @@ -13,7 +13,7 @@ io.fd.hc2vpp.common samples-api ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 686e73819..b509d12e3 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 + 1.17.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 samples-impl ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index fcd09fa4a..c62a26625 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../../common/api-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index 623515d56..2af924f69 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.v3po v3po-aggregator - 1.17.04 + 1.17.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index 14d4b6c65..0e2cc10ea 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 + 1.17.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index d1d3a10f1..1eadf2dde 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 + 1.17.04.1-SNAPSHOT ../../common/api-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-api ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT bundle diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index 29a96099c..aba7cdc61 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 + 1.17.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -30,14 +30,14 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-impl ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT io.fd.hc2vpp.vpp.classifier vpp-classifier-api - ${project.version} + 1.17.04.1-SNAPSHOT diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index 24983e083..c6a07353d 100644 --- a/vpp-management/pom.xml +++ b/vpp-management/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.04 + 1.17.04.1-SNAPSHOT ../common/hc2vpp-parent @@ -31,7 +31,7 @@ io.fd.hc2vpp.management vpp-management-aggregator ${project.artifactId} - 1.17.04 + 1.17.04.1-SNAPSHOT Aggregator for Hc2vpp vpp-management plugin diff --git a/vpp-version b/vpp-version index f64171254..fea07c41e 100755 --- a/vpp-version +++ b/vpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo '17.04-release' +echo 'RELEASE' # Determines which VPP version to use in hc2vpp-integration job. # 'RELEASE' will use the latest VPP in the respective branch. -- cgit 1.2.3-korg