From 7758b80f96ce03b475c94be49b259bf0a2dd40dd Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 30 Oct 2017 15:13:37 +0100 Subject: Bump Hc2vpp version to 1.17.10 Also updates honeycomb dependencies. Change-Id: I2f04e80f2c1da3d9ac82425f517e8fd3d5cd4213 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 | 8 +++---- packaging/rpm/honeycomb.spec | 6 ++--- packaging/rpm/release | 6 ++--- packaging/rpm/rpmbuild.sh | 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 | 4 ++-- vpp-integration/api-docs/docs/pom.xml | 2 +- vpp-integration/api-docs/pom.xml | 4 ++-- vpp-integration/api-docs/scripts/pom.xml | 2 +- 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 +- 71 files changed, 164 insertions(+), 164 deletions(-) diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 56e3abe86..849d7f298 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.10-SNAPSHOT + 1.17.10 ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.acl acl-api acl-api - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 14df33901..6ad10e9f3 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.10-SNAPSHOT + 1.17.10 ../../common/impl-parent 4.0.0 io.fd.hc2vpp.acl acl-impl - 1.17.10-SNAPSHOT + 1.17.10 17.10 diff --git a/acl/pom.xml b/acl/pom.xml index 0667bf116..5611678ec 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent acl-aggregator - 1.17.10-SNAPSHOT + 1.17.10 acl-aggregator pom 4.0.0 diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index c2ab06b66..9ec5b1c29 100644 --- a/bgp/inet/pom.xml +++ b/bgp/inet/pom.xml @@ -5,7 +5,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../vpp-common/vpp-impl-parent @@ -13,7 +13,7 @@ io.fd.hc2vpp.bgp bgp-inet ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/bgp/pom.xml b/bgp/pom.xml index 27519b086..db97c3e34 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent io.fd.hc2vpp.bgp bgp-aggregator - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} pom 4.0.0 diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index 1490659f2..de5da2d6c 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.10-SNAPSHOT + 1.17.10 ../hc2vpp-parent io.fd.hc2vpp.common api-parent ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 pom diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index b6b9e1cc6..27a99d7cc 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.10-SNAPSHOT + 1.17.10 io.fd.hc2vpp.common hc2vpp-parent ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 pom \ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index e40bebd61..094dffa62 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.10-SNAPSHOT + 1.17.10 ../hc2vpp-parent io.fd.hc2vpp.common impl-parent ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 pom @@ -23,7 +23,7 @@ io.fd.honeycomb.common impl-parent - 1.17.10-SNAPSHOT + 1.17.10 pom import diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index f9ba54ad3..6730a78cb 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.10-SNAPSHOT + 1.17.10 ../impl-parent io.fd.hc2vpp.common minimal-distribution-parent - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} pom @@ -29,7 +29,7 @@ io.fd.honeycomb.common minimal-distribution-parent - 1.17.10-SNAPSHOT + 1.17.10 pom import @@ -129,7 +129,7 @@ io.fd.honeycomb.common common-scripts - 1.17.10-SNAPSHOT + 1.17.10 @@ -142,7 +142,7 @@ io.fd.honeycomb.common minimal-assembly-descriptor - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/common/pom.xml b/common/pom.xml index 384c4c117..f508e6c00 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 hc2vpp-parent io.fd.hc2vpp.common hc2vpp-common-aggregator - 1.17.10-SNAPSHOT + 1.17.10 ${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 31758b20d..a7f2774a3 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.10-SNAPSHOT + 1.17.10 ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-api dhcp-api - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index f2af59f1f..3c43627de 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.10-SNAPSHOT + 1.17.10 ../../vpp-common/vpp-impl-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-impl dhcp-impl - 1.17.10-SNAPSHOT + 1.17.10 bundle @@ -69,7 +69,7 @@ io.fd.honeycomb translate-impl - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/dhcp/pom.xml b/dhcp/pom.xml index 8519b5cb3..9e934cd5e 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent dhcp-aggregator - 1.17.10-SNAPSHOT + 1.17.10 dhcp-aggregator pom 4.0.0 diff --git a/interface-role/api/pom.xml b/interface-role/api/pom.xml index 67a2f1722..3424c1640 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.10-SNAPSHOT + 1.17.10 ../../common/api-parent 4.0.0 io.fd.hc2vpp.iface.role api - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index 651eb58d3..c543cad04 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.10-SNAPSHOT + 1.17.10 ../../common/impl-parent io.fd.hc2vpp.iface.role impl - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} diff --git a/interface-role/pom.xml b/interface-role/pom.xml index 1cb08c1a7..885c3a6a3 100644 --- a/interface-role/pom.xml +++ b/interface-role/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent @@ -14,7 +14,7 @@ io.fd.hc2vpp.iface.role interface-role-aggregator pom - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 75bf73c25..97a9260a6 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 67ef26087..a9544128b 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../common/impl-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/ioam/pom.xml b/ioam/pom.xml index 4174c8ecf..c3e392d51 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent io.fd.hc2vpp.ioam vppioam-aggregator - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} pom 4.0.0 diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index 75908bbcd..64f4165db 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.10-SNAPSHOT + 1.17.10 ../../common/impl-parent 4.0.0 io.fd.hc2vpp.it api-coverage - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index 855eb2fca..a9c12d457 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.10-SNAPSHOT + 1.17.10 ../../common/hc2vpp-parent 4.0.0 api-test - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} diff --git a/it/pom.xml b/it/pom.xml index ce894eb4a..f4199c308 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent 4.0.0 diff --git a/l3/api/pom.xml b/l3/api/pom.xml index cee3dc2b5..466509a8b 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ io.fd.hc2vpp.common api-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../common/api-parent io.fd.hc2vpp.l3 l3-api ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 77b52e584..6d7913c51 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-impl ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/l3/pom.xml b/l3/pom.xml index eeadc1fd5..64b08395c 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent pom diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index b11ae4507..1162a2749 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-utils ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index adc788484..ec484eb07 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../common/api-parent @@ -26,12 +26,12 @@ io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle io.fd.honeycomb - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 1fd64de68..33dc99d44 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index c1b384b47..38cf40135 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent io.fd.hc2vpp.lisp lisp-aggregator - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} pom 4.0.0 diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index 4477c6100..c4852718c 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.10-SNAPSHOT + 1.17.10 ../../common/api-parent @@ -25,11 +25,11 @@ io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 01bdbcc12..d58ea6e8f 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.10-SNAPSHOT + 1.17.10 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT + 1.17.10 + 1.17.10 diff --git a/nat/pom.xml b/nat/pom.xml index dfcf8fedb..f9b24e79f 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent io.fd.hc2vpp.nat nat-aggregator - 1.17.10-SNAPSHOT + 1.17.10 nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index 62ab566ca..62a7a9d9e 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 9ecc7626b..adacda177 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../common/impl-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/nsh/pom.xml b/nsh/pom.xml index d942047c3..96a734d14 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent io.fd.hc2vpp.nsh vppnsh-aggregator - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index a27f53c02..bc8ef4132 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}-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}-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}/ ${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}/* /opt/honeycomb/ $3 $4 EOT diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index 3c4e7efde..d759d8bb7 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}-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} %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}/* $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 258792295..3ec80eac1 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,13 +1,13 @@ #!/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 -# $(expr $BUILD_NUMBER + 2000) +# echo $(expr $BUILD_NUMBER + 2000) # echo RC1~$(expr $BUILD_NUMBER + 2000) -echo RC2~$(expr $BUILD_NUMBER + 2000) +# echo RC2~$(expr $BUILD_NUMBER + 2000) # 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 d3f90feec..583b8a429 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.10-SNAPSHOT-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.10-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ diff --git a/pom.xml b/pom.xml index 07096e1e5..b1eecf62a 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 common/hc2vpp-parent io.fd.hc2vpp hc2vpp-aggregator - 1.17.10-SNAPSHOT + 1.17.10 hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index b34c6b85f..aed0bfecd 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent io.fd.hc2vpp release-notes-aggregator - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} pom 4.0.0 diff --git a/routing/pom.xml b/routing/pom.xml index 561b39b2c..5b4eeff66 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent io.fd.hc2vpp.routing routing-aggregator - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index f5be93930..aa88bd3fc 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.10-SNAPSHOT + 1.17.10 ../../common/api-parent 4.0.0 io.fd.hc2vpp.routing routing-api - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 159f8b231..0c67f849f 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.10-SNAPSHOT + 1.17.10 ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.routing routing-impl - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/samples/pom.xml b/samples/pom.xml index 8a6b041b3..835bae582 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent 4.0.0 diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index 618d9a6c2..9be9b2262 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.10-SNAPSHOT + 1.17.10 ../../common/api-parent 4.0.0 @@ -13,7 +13,7 @@ io.fd.hc2vpp.common samples-api ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 1c38bdc89..a919a7a53 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.10-SNAPSHOT + 1.17.10 ../../vpp-common/vpp-impl-parent 4.0.0 samples-impl ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index bd8bbb27f..a9684b07d 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../common/api-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index 603f4031b..536ff9224 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent io.fd.hc2vpp.v3po v3po-aggregator - 1.17.10-SNAPSHOT + 1.17.10 ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index ef0278d72..85f2b2c32 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.10-SNAPSHOT + 1.17.10 ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 241ba4955..71e5808f4 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.10-SNAPSHOT + 1.17.10 ../../common/api-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-api ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 bundle diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index c23315b4a..5dfc71dc9 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.10-SNAPSHOT + 1.17.10 ../../vpp-common/vpp-impl-parent @@ -30,14 +30,14 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-impl ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 io.fd.hc2vpp.vpp.classifier vpp-classifier-api - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/vpp-integration/api-docs/pom.xml b/vpp-integration/api-docs/pom.xml index cb1f1ac61..2d49859e5 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.10-SNAPSHOT + 1.17.10 ../../common/hc2vpp-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.docs api-docs pom - 1.17.10-SNAPSHOT + 1.17.10 core diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml index e69b4f11c..4d1804bdc 100644 --- a/vpp-integration/api-docs/scripts/pom.xml +++ b/vpp-integration/api-docs/scripts/pom.xml @@ -22,7 +22,7 @@ io.fd.hc2vpp.docs scripts - 1.17.10-SNAPSHOT + 1.17.10 2.4.7 diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index b04891a00..e3abf3e91 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.10-SNAPSHOT + 1.17.10 ../../common/minimal-distribution-parent @@ -27,25 +27,25 @@ io.fd.hc2vpp.integration vpp-integration-distribution ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 io.fd.honeycomb.infra.distro.Main - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT - 1.17.10-SNAPSHOT + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 + 1.17.10 io.fd.hc2vpp.common.integration.VppCommonModule, diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index 1bdd655b1..8e78a48c5 100644 --- a/vpp-integration/pom.xml +++ b/vpp-integration/pom.xml @@ -19,14 +19,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent io.fd.hc2vpp.integration vpp-integration ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 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 90ca2da46..c1fdc11e6 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.10-SNAPSHOT + 1.17.10 ../../common/api-parent io.fd.hc2vpp.management vpp-management-api - 1.17.10-SNAPSHOT + 1.17.10 \ No newline at end of file diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index f2d918037..7950bfc10 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.10-SNAPSHOT + 1.17.10 ../../vpp-common/vpp-impl-parent @@ -29,7 +29,7 @@ io.fd.hc2vpp.management vpp-management-impl - 1.17.10-SNAPSHOT + 1.17.10 diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index 8b5fa751b..70aedacf9 100644 --- a/vpp-management/pom.xml +++ b/vpp-management/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-SNAPSHOT + 1.17.10 ../common/hc2vpp-parent @@ -31,7 +31,7 @@ io.fd.hc2vpp.management vpp-management-aggregator ${project.artifactId} - 1.17.10-SNAPSHOT + 1.17.10 Aggregator for Hc2vpp vpp-management plugin diff --git a/vpp-version b/vpp-version index fea07c41e..30531913d 100755 --- a/vpp-version +++ b/vpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo 'RELEASE' +echo '17.10-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