From 7a480f0d3e0df69f306479e5ee11e4430e4d92ad Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 28 Jul 2017 15:10:26 +0200 Subject: Set Hc2vpp version to 1.17.07.1-SNAPSHOT Change-Id: I53e12a6e48130455e6b2c1e395517041f728f7a7 Signed-off-by: Marek Gradzki --- acl/acl-api/pom.xml | 4 ++-- acl/acl-impl/pom.xml | 4 ++-- acl/pom.xml | 4 ++-- bgp/inet/pom.xml | 4 ++-- bgp/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 ++-- interface-role/api/pom.xml | 4 ++-- interface-role/impl/pom.xml | 4 ++-- interface-role/pom.xml | 4 ++-- ioam/api/pom.xml | 4 ++-- ioam/impl/pom.xml | 4 ++-- ioam/pom.xml | 4 ++-- it/api-coverage/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 | 10 ++++---- 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 | 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/api-docs/api/pom.xml | 4 ++-- vpp-integration/api-docs/core/pom.xml | 6 ++--- vpp-integration/api-docs/docs/pom.xml | 2 +- vpp-integration/api-docs/pom.xml | 4 ++-- vpp-integration/api-docs/scripts/pom.xml | 4 ++-- vpp-integration/minimal-distribution/pom.xml | 34 ++++++++++++++-------------- 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 +- 72 files changed, 167 insertions(+), 167 deletions(-) diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index b399936c1..e18e63108 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.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.acl acl-api acl-api - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 3ffdc1895..eef3d749e 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.07 + 1.17.07.1-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.acl acl-impl - 1.17.07 + 1.17.07.1-SNAPSHOT 17.07 diff --git a/acl/pom.xml b/acl/pom.xml index af44b0210..daeef8c76 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent acl-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT acl-aggregator pom 4.0.0 diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index fe5e1f54a..1fe4f6742 100644 --- a/bgp/inet/pom.xml +++ b/bgp/inet/pom.xml @@ -5,7 +5,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -13,7 +13,7 @@ io.fd.hc2vpp.bgp bgp-inet ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/bgp/pom.xml b/bgp/pom.xml index e5364b9c8..9c2bf9849 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.bgp bgp-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index c62acce92..09edc0b21 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.07 + 1.17.07.1-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common api-parent ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT pom diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index 8292af5c6..278986fca 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.07 + 1.17.07.1-SNAPSHOT io.fd.hc2vpp.common hc2vpp-parent ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT pom \ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index a52362317..b1f252abe 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.07 + 1.17.07.1-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common impl-parent ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT pom @@ -23,7 +23,7 @@ io.fd.honeycomb.common impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT pom import diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 3847a4d53..d722d8e22 100644 --- a/common/minimal-distribution-parent/pom.xml +++ b/common/minimal-distribution-parent/pom.xml @@ -7,13 +7,13 @@ io.fd.hc2vpp.common impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../impl-parent io.fd.hc2vpp.common minimal-distribution-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} pom @@ -29,7 +29,7 @@ io.fd.honeycomb.common minimal-distribution-parent - 1.17.07 + 1.17.07.1-SNAPSHOT pom import @@ -129,7 +129,7 @@ io.fd.honeycomb.common common-scripts - 1.17.07 + 1.17.07.1-SNAPSHOT @@ -142,7 +142,7 @@ io.fd.honeycomb.common minimal-assembly-descriptor - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 4d6def21f..c28adcf4b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT hc2vpp-parent io.fd.hc2vpp.common hc2vpp-common-aggregator - 1.17.07 + 1.17.07.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 7b5a78411..18739a911 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.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-api dhcp-api - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index eeb6a4fa8..5c3a8cb7e 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.07 + 1.17.07.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-impl dhcp-impl - 1.17.07 + 1.17.07.1-SNAPSHOT bundle @@ -69,7 +69,7 @@ io.fd.honeycomb translate-impl - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/dhcp/pom.xml b/dhcp/pom.xml index b8a69a253..89e1d842e 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent dhcp-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT dhcp-aggregator pom 4.0.0 diff --git a/interface-role/api/pom.xml b/interface-role/api/pom.xml index eb8efdac2..0fa94eaa1 100644 --- a/interface-role/api/pom.xml +++ b/interface-role/api/pom.xml @@ -5,14 +5,14 @@ io.fd.hc2vpp.common api-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.iface.role api - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index b3f822aa8..6a8bb5d49 100644 --- a/interface-role/impl/pom.xml +++ b/interface-role/impl/pom.xml @@ -23,13 +23,13 @@ io.fd.hc2vpp.common impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/impl-parent io.fd.hc2vpp.iface.role impl - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} diff --git a/interface-role/pom.xml b/interface-role/pom.xml index e1baaa804..7f734bbac 100644 --- a/interface-role/pom.xml +++ b/interface-role/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent @@ -14,7 +14,7 @@ io.fd.hc2vpp.iface.role interface-role-aggregator pom - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 3d472b6dc..7d2715ef7 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index fdeae0fca..a514fba9a 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/impl-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/ioam/pom.xml b/ioam/pom.xml index 3b556e048..61786683a 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.ioam vppioam-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index d51245bf9..e2b7e746a 100644 --- a/it/api-coverage/pom.xml +++ b/it/api-coverage/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.it api-coverage - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index f59f55c97..b713a90f5 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.07 + 1.17.07.1-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 api-test - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} diff --git a/it/pom.xml b/it/pom.xml index d584f003a..e77412601 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/l3/api/pom.xml b/l3/api/pom.xml index a5f6e2446..d0b2d9e56 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ io.fd.hc2vpp.common api-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.l3 l3-api ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 9d1f75008..6c227e9d8 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-impl ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/l3/pom.xml b/l3/pom.xml index bf28cab8c..ccf778106 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent pom diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index b78dbd905..ac61ba52d 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-utils ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index 67c338157..bf73d1e0a 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent @@ -26,12 +26,12 @@ io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle io.fd.honeycomb - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 9a13d1546..9c5a243a8 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index 6f7ab6a3f..787ff5b50 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.lisp lisp-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index e0be9d386..7523f976a 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.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent @@ -25,11 +25,11 @@ io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 08c451727..4108db845 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.07 + 1.17.07.1-SNAPSHOT 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle - 1.17.07 - 1.17.07 + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT diff --git a/nat/pom.xml b/nat/pom.xml index 7e40fe71f..db54bd24b 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nat nat-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index 58fe3b1de..c2ebd46aa 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 3f48b6da4..f9f810183 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/impl-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/nsh/pom.xml b/nsh/pom.xml index 418b9a3ff..81be53098 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nsh vppnsh-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index 10282f929..229160f5b 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 @@ -34,14 +34,14 @@ cp ${SOURCE_DIR}/$3 ${BUILD_DIR} cat <> ${BUILD_DIR}/debian/changelog honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low - * 17.07 release + * 17.07.1 release -- mgradzki Mon, 23 Feb 2016 09:41:37 +0200 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 620dff261..8cc7608ca 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 RC2~$(expr $BUILD_NUMBER + 2000) \ No newline at end of file +echo RELEASE~$(expr $BUILD_NUMBER + 2000) \ No newline at end of file diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index b00e82216..121737352 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.07-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.07.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 6c61e2ba4..ae4023939 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.17.07 +echo 1.17.07.1 diff --git a/pom.xml b/pom.xml index d1cc1d16f..65d18d851 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT common/hc2vpp-parent io.fd.hc2vpp hc2vpp-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 99b603358..b279f3cb7 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp release-notes-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/pom.xml b/routing/pom.xml index e1c3977e0..bc63cddfa 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.routing routing-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index f38e5cd31..6783225c8 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.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.routing routing-api - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 7d817a06f..864778cf0 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.07 + 1.17.07.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.routing routing-impl - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/samples/pom.xml b/samples/pom.xml index e8b9a6985..47e1e869f 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index ad8d76b4b..b4d6c2f4c 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.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent 4.0.0 @@ -13,7 +13,7 @@ io.fd.hc2vpp.common samples-api ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 6973c1093..d1b0a4b60 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.07 + 1.17.07.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 samples-impl ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 157bc84ed..0be0fb495 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index eb0818795..40aeee093 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.v3po v3po-aggregator - 1.17.07 + 1.17.07.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index 22428c144..624c4cf47 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index ff36a2089..12c017e49 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.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-api ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT bundle diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index d130f2382..2c21e3f12 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.07 + 1.17.07.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -30,14 +30,14 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-impl ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT io.fd.hc2vpp.vpp.classifier vpp-classifier-api - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/vpp-integration/api-docs/pom.xml b/vpp-integration/api-docs/pom.xml index 57357cdaf..e54416f7a 100644 --- a/vpp-integration/api-docs/pom.xml +++ b/vpp-integration/api-docs/pom.xml @@ -21,7 +21,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.docs api-docs pom - 1.17.07 + 1.17.07.1-SNAPSHOT core diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml index 9298a7977..01ea54263 100644 --- a/vpp-integration/api-docs/scripts/pom.xml +++ b/vpp-integration/api-docs/scripts/pom.xml @@ -22,14 +22,14 @@ io.fd.hc2vpp.docs scripts - 1.17.07 + 1.17.07.1-SNAPSHOT 2.4.7 2.9.2-01 2.4.3-01 - 17.07 + 17.10-SNAPSHOT 4.12 0.9.11 true diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index d1010b4e8..9420c1894 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common minimal-distribution-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/minimal-distribution-parent @@ -27,25 +27,25 @@ io.fd.hc2vpp.integration vpp-integration-distribution ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT io.fd.honeycomb.infra.distro.Main - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 - 1.17.07 + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT + 1.17.07.1-SNAPSHOT io.fd.hc2vpp.common.integration.VppCommonModule, diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index 7c49e580d..2db13a05e 100644 --- a/vpp-integration/pom.xml +++ b/vpp-integration/pom.xml @@ -19,14 +19,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.integration vpp-integration ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT pom 4.0.0 Aggregator for Honeycomb's VPP distribution. Aggregating all Hc2vpp plugins. diff --git a/vpp-management/api/pom.xml b/vpp-management/api/pom.xml index 4af6c6823..714b87acc 100644 --- a/vpp-management/api/pom.xml +++ b/vpp-management/api/pom.xml @@ -23,11 +23,11 @@ io.fd.hc2vpp.common api-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.management vpp-management-api - 1.17.07 + 1.17.07.1-SNAPSHOT \ No newline at end of file diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index f2661b015..ab68ef8f3 100644 --- a/vpp-management/impl/pom.xml +++ b/vpp-management/impl/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -29,7 +29,7 @@ io.fd.hc2vpp.management vpp-management-impl - 1.17.07 + 1.17.07.1-SNAPSHOT diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index 21cd32724..5b7e35edc 100644 --- a/vpp-management/pom.xml +++ b/vpp-management/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07 + 1.17.07.1-SNAPSHOT ../common/hc2vpp-parent @@ -31,7 +31,7 @@ io.fd.hc2vpp.management vpp-management-aggregator ${project.artifactId} - 1.17.07 + 1.17.07.1-SNAPSHOT Aggregator for Hc2vpp vpp-management plugin diff --git a/vpp-version b/vpp-version index e2e4cf7ec..fea07c41e 100755 --- a/vpp-version +++ b/vpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo '17.07-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