From 314c466ff46edd1e9b7de62541209e8b033ec343 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 7 Dec 2016 09:04:36 +0100 Subject: Set hc2vpp version to 17.01 to align with vpp release Depends on https://gerrit.fd.io/r/#/c/4137 Change-Id: I11cc690bf5d12db5c7223f46a19c3f555213aead Signed-off-by: Marek Gradzki --- ioam/api/pom.xml | 4 ++-- ioam/impl/pom.xml | 4 ++-- ioam/pom.xml | 4 ++-- lisp/api/pom.xml | 6 +++--- lisp/lisp2vpp/pom.xml | 4 ++-- lisp/pom.xml | 4 ++-- nat/asciidoc/Readme.adoc | 2 +- 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 | 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 ++-- v3po/api/pom.xml | 4 ++-- v3po/pom.xml | 4 ++-- v3po/v3po2vpp/pom.xml | 4 ++-- 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 | 18 +++++++++--------- vpp-integration/pom.xml | 4 ++-- 33 files changed, 75 insertions(+), 75 deletions(-) diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 456c0540d..195c701d4 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.honeycomb.common api-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 91b02de86..85d728c64 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,14 +18,14 @@ io.fd.honeycomb.common impl-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/ioam/pom.xml b/ioam/pom.xml index 3153dc29d..3a0df0fc7 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,12 +18,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp.ioam vppioam-aggregator - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index 850d3c525..0f1a2a1ba 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,19 +18,19 @@ io.fd.honeycomb.common api-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle io.fd.honeycomb - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 841dcb911..97fafd83d 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index d6cc2e4f5..b9f2baf26 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,12 +19,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp.lisp lisp-aggregator - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/nat/asciidoc/Readme.adoc b/nat/asciidoc/Readme.adoc index eced90f11..548696446 100644 --- a/nat/asciidoc/Readme.adoc +++ b/nat/asciidoc/Readme.adoc @@ -1,7 +1,7 @@ = SNAT Support fot VPP's SNAT plugin: -https://docs.fd.io/vpp/16.12/plugins_snat-plugin_snat.html +https://docs.fd.io/vpp/17.01/plugins_snat-plugin_snat.html == Supported features diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index 8061690ee..136c61d44 100644 --- a/nat/nat-api/pom.xml +++ b/nat/nat-api/pom.xml @@ -17,18 +17,18 @@ io.fd.honeycomb.common api-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 60eb7d469..4931df969 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.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle - 1.16.12-SNAPSHOT - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT + 1.17.01-SNAPSHOT diff --git a/nat/pom.xml b/nat/pom.xml index 742d3f282..e11b95acf 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,12 +18,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp.nat nat-aggregator - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index 4ef78dda2..b87e1a13b 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,14 +18,14 @@ io.fd.honeycomb.common api-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index f0af28920..acd40048c 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.honeycomb.common impl-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/nsh/pom.xml b/nsh/pom.xml index 8ddfef818..ada037bb0 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,12 +18,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp.nsh vppnsh-aggregator - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index 9663bccbe..fd08251dc 100755 --- a/packaging/deb/common/prepare.sh +++ b/packaging/deb/common/prepare.sh @@ -11,7 +11,7 @@ BUILD_DIR=${SOURCE_DIR}/honeycomb-${VERSION} # Copy and unpack the archive with vpp-integration distribution ARCHIVE_DIR=${SOURCE_DIR}/../../../vpp-integration/minimal-distribution/target/ -ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-1.16.12-SNAPSHOT-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-1.17.01-SNAPSHOT-hc.tar.gz cp ${ARCHIVE} ${SOURCE_DIR} ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/ @@ -31,7 +31,7 @@ cp ${SOURCE_DIR}/$3 ${BUILD_DIR} cat <> ${BUILD_DIR}/debian/changelog honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low - * 16.12 release + * 17.01 release -- mmarsale Mon, 22 Aug 2016 09:41:37 +0200 EOT diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index 5e8ab6e7a..2607d4c11 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.16.12-SNAPSHOT-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.01-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 d1194ffdb..ad82928d4 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.16.12 +echo 1.17.01 diff --git a/pom.xml b/pom.xml index 22dbbdf23..82087c424 100644 --- a/pom.xml +++ b/pom.xml @@ -17,12 +17,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp hc2vpp-aggregator - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index a29ee5d1a..da4f5513a 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,12 +19,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp release-notes-aggregator - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/pom.xml b/routing/pom.xml index 12bbeb20c..3b93d6bef 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,12 +19,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp.routing routing-aggregator - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index 0f029d1cb..83008d97a 100644 --- a/routing/routing-api/pom.xml +++ b/routing/routing-api/pom.xml @@ -18,13 +18,13 @@ io.fd.honeycomb.common api-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.routing routing-api - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 4de7810f4..3d127915d 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.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.routing routing-impl - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 4b34c0d7f..67ab1ad05 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,14 +17,14 @@ io.fd.honeycomb.common api-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index 28e9ab023..78187b450 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,12 +18,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp.v3po v3po-aggregator - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index d4c65debb..f1cfe1d3a 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/vpp-common/naming-context-api/pom.xml b/vpp-common/naming-context-api/pom.xml index c071e50f0..25106e259 100644 --- a/vpp-common/naming-context-api/pom.xml +++ b/vpp-common/naming-context-api/pom.xml @@ -18,14 +18,14 @@ io.fd.honeycomb.common api-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.common naming-context-api ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml index 90e651b30..94f0571f8 100644 --- a/vpp-common/naming-context-impl/pom.xml +++ b/vpp-common/naming-context-impl/pom.xml @@ -19,14 +19,14 @@ io.fd.honeycomb.common impl-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.common naming-context-impl ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index 7c4e977db..6d64304e6 100644 --- a/vpp-common/pom.xml +++ b/vpp-common/pom.xml @@ -18,12 +18,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp.common vpp-common-aggregator - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml index 23901dfd9..8afad98be 100644 --- a/vpp-common/vpp-common-integration/pom.xml +++ b/vpp-common/vpp-common-integration/pom.xml @@ -19,16 +19,16 @@ io.fd.honeycomb.common impl-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.common vpp-common-integration - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 17.01-SNAPSHOT 1.3 diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml index b2ed6bd79..4c6887425 100644 --- a/vpp-common/vpp-impl-parent/pom.xml +++ b/vpp-common/vpp-impl-parent/pom.xml @@ -19,14 +19,14 @@ io.fd.honeycomb.common impl-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.common vpp-impl-parent ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT pom diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml index e3fb45bbb..50c839033 100644 --- a/vpp-common/vpp-translate-test/pom.xml +++ b/vpp-common/vpp-translate-test/pom.xml @@ -20,13 +20,13 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 vpp-translate-test - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml index 94bb07aab..5d14326b7 100644 --- a/vpp-common/vpp-translate-utils/pom.xml +++ b/vpp-common/vpp-translate-utils/pom.xml @@ -19,14 +19,14 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 vpp-translate-utils ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT bundle diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index 8a3d66875..05da92682 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -19,24 +19,24 @@ io.fd.honeycomb.common minimal-distribution-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.integration vpp-integration-distribution ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.honeycomb.infra.distro.Main - 1.16.12-SNAPSHOT - 1.16.12-SNAPSHOT - 1.16.12-SNAPSHOT - 1.16.12-SNAPSHOT - 1.16.12-SNAPSHOT - 1.16.12-SNAPSHOT - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT + 1.17.01-SNAPSHOT + 1.17.01-SNAPSHOT + 1.17.01-SNAPSHOT + 1.17.01-SNAPSHOT + 1.17.01-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp.common.integration.VppCommonModule, diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index a36064e4f..5186b1149 100644 --- a/vpp-integration/pom.xml +++ b/vpp-integration/pom.xml @@ -19,13 +19,13 @@ io.fd.honeycomb.common honeycomb-parent - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT io.fd.hc2vpp.integration vpp-integration ${project.artifactId} - 1.16.12-SNAPSHOT + 1.17.01-SNAPSHOT pom 4.0.0 Aggregator for Honeycomb's VPP distribution. Aggregating all VPP plugins. -- cgit 1.2.3-korg