From 1075563ac279866b2aed210d4dac5504af2e2a56 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 4 Jan 2017 20:40:12 +0100 Subject: Bump hc2vpp versoin to 17.04 Also updates version of honeycomb dependencies. Vpp API version bump moved to separate commit due to issues with jvpp jars. Change-Id: Id336393b00fe05e8ecee9b547dcfc6a49e1a98ec Signed-off-by: Marek Gradzki --- acl/acl-api/pom.xml | 4 ++-- acl/acl-impl/pom.xml | 4 ++-- acl/pom.xml | 4 ++-- 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 | 14 +++++++------- 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 | 20 ++++++++++---------- vpp-integration/pom.xml | 4 ++-- 36 files changed, 87 insertions(+), 87 deletions(-) diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index fd619c730..6efa30444 100644 --- a/acl/acl-api/pom.xml +++ b/acl/acl-api/pom.xml @@ -16,14 +16,14 @@ io.fd.honeycomb.common api-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.acl acl-api acl-api - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 7f08ca762..3df24e346 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -20,13 +20,13 @@ io.fd.honeycomb.common impl-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.acl acl-impl - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 1.0-SNAPSHOT diff --git a/acl/pom.xml b/acl/pom.xml index 8f160968b..586166dc9 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,10 +19,10 @@ hc2vpp-aggregator io.fd.hc2vpp - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT acl-aggregator - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT acl-aggregator pom 4.0.0 diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 195c701d4..200a06ccd 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.honeycomb.common api-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 95366aa9d..ec273f9e7 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,14 +18,14 @@ io.fd.honeycomb.common impl-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/ioam/pom.xml b/ioam/pom.xml index 3a0df0fc7..90852df8c 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,12 +18,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp.ioam vppioam-aggregator - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index 0f1a2a1ba..6dc8d41ad 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,19 +18,19 @@ io.fd.honeycomb.common api-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle io.fd.honeycomb - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 97fafd83d..62663069d 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index b9f2baf26..661028286 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,12 +19,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp.lisp lisp-aggregator - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/nat/asciidoc/Readme.adoc b/nat/asciidoc/Readme.adoc index 548696446..b1282331e 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/17.01/plugins_snat-plugin_snat.html +https://docs.fd.io/vpp/17.04/plugins_snat-plugin_snat.html == Supported features diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index 136c61d44..74a725370 100644 --- a/nat/nat-api/pom.xml +++ b/nat/nat-api/pom.xml @@ -17,18 +17,18 @@ io.fd.honeycomb.common api-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 4931df969..79b68744e 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.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle - 1.17.01-SNAPSHOT - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT + 1.17.04-SNAPSHOT diff --git a/nat/pom.xml b/nat/pom.xml index e11b95acf..4765cf394 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,12 +18,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp.nat nat-aggregator - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index b87e1a13b..f5cf3747a 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,14 +18,14 @@ io.fd.honeycomb.common api-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index e6020168f..76771081c 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.honeycomb.common impl-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/nsh/pom.xml b/nsh/pom.xml index ada037bb0..25c023123 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,12 +18,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp.nsh vppnsh-aggregator - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index fd08251dc..1009fc942 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.17.01-SNAPSHOT-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-1.17.04-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 - * 17.01 release + * 17.04 release -- mmarsale Mon, 22 Aug 2016 09:41:37 +0200 EOT diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index 2607d4c11..b50beb436 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.01-SNAPSHOT-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04-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 ad82928d4..f0bea456b 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.17.01 +echo 1.17.04 diff --git a/pom.xml b/pom.xml index 9ea1815c4..cdda10117 100644 --- a/pom.xml +++ b/pom.xml @@ -17,12 +17,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp hc2vpp-aggregator - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index da4f5513a..6c1dbfe2d 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,12 +19,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp release-notes-aggregator - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT ${project.artifactId} pom 4.0.0 @@ -75,13 +75,13 @@ ${project.version} - 17.01 - 10404 + 17.04 + 10601 master - 17.01 + 17.04 - - 17.01-SNAPSHOT + + 17.04-SNAPSHOT 1.0 diff --git a/routing/pom.xml b/routing/pom.xml index 3b93d6bef..e23956972 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,12 +19,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp.routing routing-aggregator - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index 83008d97a..e473ebb51 100644 --- a/routing/routing-api/pom.xml +++ b/routing/routing-api/pom.xml @@ -18,13 +18,13 @@ io.fd.honeycomb.common api-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.routing routing-api - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 3d127915d..b67fc4f71 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.01-SNAPSHOT + 1.17.04-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.routing routing-impl - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 67ab1ad05..2626d7bad 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,14 +17,14 @@ io.fd.honeycomb.common api-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index 78187b450..35ae858c1 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,12 +18,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp.v3po v3po-aggregator - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index b1909ed08..aa14b42a6 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/vpp-common/naming-context-api/pom.xml b/vpp-common/naming-context-api/pom.xml index 25106e259..6c16db4d2 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.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.common naming-context-api ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml index 94f0571f8..5b0870dc8 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.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.common naming-context-impl ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index 6d64304e6..a457d393a 100644 --- a/vpp-common/pom.xml +++ b/vpp-common/pom.xml @@ -18,12 +18,12 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp.common vpp-common-aggregator - 1.17.01-SNAPSHOT + 1.17.04-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 8afad98be..265e9084e 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.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.common vpp-common-integration - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT - 1.17.01-SNAPSHOT + 1.17.04-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 4c6887425..b8453a598 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.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.common vpp-impl-parent ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT pom diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml index 50c839033..39059156f 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.17.01-SNAPSHOT + 1.17.04-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 vpp-translate-test - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml index 5d14326b7..4094a293a 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.17.01-SNAPSHOT + 1.17.04-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 vpp-translate-utils ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT bundle diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index ffef78614..d5b4d8d5b 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -19,25 +19,25 @@ io.fd.honeycomb.common minimal-distribution-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT 4.0.0 io.fd.hc2vpp.integration vpp-integration-distribution ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.honeycomb.infra.distro.Main - 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 - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT + 1.17.04-SNAPSHOT + 1.17.04-SNAPSHOT + 1.17.04-SNAPSHOT + 1.17.04-SNAPSHOT + 1.17.04-SNAPSHOT + 1.17.04-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp.common.integration.VppCommonModule, diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index 5186b1149..502717221 100644 --- a/vpp-integration/pom.xml +++ b/vpp-integration/pom.xml @@ -19,13 +19,13 @@ io.fd.honeycomb.common honeycomb-parent - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT io.fd.hc2vpp.integration vpp-integration ${project.artifactId} - 1.17.01-SNAPSHOT + 1.17.04-SNAPSHOT pom 4.0.0 Aggregator for Honeycomb's VPP distribution. Aggregating all VPP plugins. -- cgit 1.2.3-korg