From ed51dab992b6a03d63ae2096f4736a6ddf449ecf Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 4 Oct 2017 08:26:57 +0200 Subject: Set hc2vpp version back to 1.17.10-SNAPSHOT Change-Id: I6fa53750c10dc914794d4d45ebc5fdb881e214c8 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 | 4 ++-- 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 ++-- 70 files changed, 162 insertions(+), 162 deletions(-) diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index fd1fee984..56e3abe86 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-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.acl acl-api acl-api - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index d9b12f040..638ea54c2 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-RC1 + 1.17.10-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.acl acl-impl - 1.17.10-RC1 + 1.17.10-SNAPSHOT 17.10-SNAPSHOT diff --git a/acl/pom.xml b/acl/pom.xml index f8c33ad3c..0667bf116 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent acl-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT acl-aggregator pom 4.0.0 diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index 87f659a49..c2ab06b66 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-RC1 + 1.17.10-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -13,7 +13,7 @@ io.fd.hc2vpp.bgp bgp-inet ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/bgp/pom.xml b/bgp/pom.xml index b25354188..27519b086 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.bgp bgp-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index c7910b511..1490659f2 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-RC1 + 1.17.10-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common api-parent ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT pom diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index 90cc6a6c3..b6b9e1cc6 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-RC1 + 1.17.10-SNAPSHOT io.fd.hc2vpp.common hc2vpp-parent ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT pom \ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index 2fcc64057..e40bebd61 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-RC1 + 1.17.10-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common impl-parent ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT pom @@ -23,7 +23,7 @@ io.fd.honeycomb.common impl-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT pom import diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 06ecdfd05..f9ba54ad3 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-RC1 + 1.17.10-SNAPSHOT ../impl-parent io.fd.hc2vpp.common minimal-distribution-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} pom @@ -29,7 +29,7 @@ io.fd.honeycomb.common minimal-distribution-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT pom import @@ -129,7 +129,7 @@ io.fd.honeycomb.common common-scripts - 1.17.10-RC1 + 1.17.10-SNAPSHOT @@ -142,7 +142,7 @@ io.fd.honeycomb.common minimal-assembly-descriptor - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index ced9de080..384c4c117 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT hc2vpp-parent io.fd.hc2vpp.common hc2vpp-common-aggregator - 1.17.10-RC1 + 1.17.10-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 340e1321e..31758b20d 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-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-api dhcp-api - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 04d18a878..f2af59f1f 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-RC1 + 1.17.10-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-impl dhcp-impl - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle @@ -69,7 +69,7 @@ io.fd.honeycomb translate-impl - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/dhcp/pom.xml b/dhcp/pom.xml index a638b1cfb..8519b5cb3 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent dhcp-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT dhcp-aggregator pom 4.0.0 diff --git a/interface-role/api/pom.xml b/interface-role/api/pom.xml index 9948e73f4..67a2f1722 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-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.iface.role api - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index dcf241482..651eb58d3 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-RC1 + 1.17.10-SNAPSHOT ../../common/impl-parent io.fd.hc2vpp.iface.role impl - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} diff --git a/interface-role/pom.xml b/interface-role/pom.xml index 890617ee6..1cb08c1a7 100644 --- a/interface-role/pom.xml +++ b/interface-role/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent @@ -14,7 +14,7 @@ io.fd.hc2vpp.iface.role interface-role-aggregator pom - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 447cb0456..75bf73c25 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index e2c907159..f7c122f18 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../../common/impl-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/ioam/pom.xml b/ioam/pom.xml index 35eb75ddc..4174c8ecf 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.ioam vppioam-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index 64e252d38..9d7f226a7 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-RC1 + 1.17.10-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.it api-coverage - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index 5f99a4d5d..855eb2fca 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-RC1 + 1.17.10-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 api-test - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} diff --git a/it/pom.xml b/it/pom.xml index 376d49bbe..ce894eb4a 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/l3/api/pom.xml b/l3/api/pom.xml index 535e8f361..cee3dc2b5 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ io.fd.hc2vpp.common api-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.l3 l3-api ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 2ef47d7f3..77b52e584 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-RC1 + 1.17.10-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-impl ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/l3/pom.xml b/l3/pom.xml index f6a16314d..eeadc1fd5 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent pom diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index 3c61b2216..b11ae4507 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-RC1 + 1.17.10-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-utils ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index a22c763d8..adc788484 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent @@ -26,12 +26,12 @@ io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle io.fd.honeycomb - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 5c756b884..1fd64de68 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-RC1 + 1.17.10-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index 8a8eabb06..c1b384b47 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.lisp lisp-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index 3c3071c5c..4477c6100 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-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent @@ -25,11 +25,11 @@ io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index d9463d335..479a96fef 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-RC1 + 1.17.10-SNAPSHOT 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle - 1.17.10-RC1 - 1.17.10-RC1 + 1.17.10-SNAPSHOT + 1.17.10-SNAPSHOT diff --git a/nat/pom.xml b/nat/pom.xml index c78d15dfb..dfcf8fedb 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nat nat-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index a1d83bc46..62ab566ca 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 3c45f0298..1eb7588c6 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../../common/impl-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/nsh/pom.xml b/nsh/pom.xml index a7dab9f43..d942047c3 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nsh vppnsh-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index 32d53aa99..a27f53c02 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}-RC1-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}-RC1-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}-RC1/ ${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}-RC1/* /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 bb90aad0b..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}-RC1-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}-RC1 +%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}-RC1/* $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 20f45b9c4..4de82e41c 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,10 +1,10 @@ #!/bin/bash # release version -echo RC1 +# 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 a08423306..d3f90feec 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-RC1-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.10-SNAPSHOT-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 e06040830..07096e1e5 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT common/hc2vpp-parent io.fd.hc2vpp hc2vpp-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 9807d009b..543d6b998 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp release-notes-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/pom.xml b/routing/pom.xml index 1b69607f0..561b39b2c 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.routing routing-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index 55948b8b4..f5be93930 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-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.routing routing-api - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 77e89e529..159f8b231 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-RC1 + 1.17.10-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.routing routing-impl - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/samples/pom.xml b/samples/pom.xml index 39691fb2d..8a6b041b3 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index 0e0d9160d..618d9a6c2 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-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent 4.0.0 @@ -13,7 +13,7 @@ io.fd.hc2vpp.common samples-api ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 520d0237d..1c38bdc89 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-RC1 + 1.17.10-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 samples-impl ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index bc82a3e00..bd8bbb27f 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index d6cd897bc..603f4031b 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.v3po v3po-aggregator - 1.17.10-RC1 + 1.17.10-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index fef4e17db..ef0278d72 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-RC1 + 1.17.10-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 6ffd9409e..241ba4955 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-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-api ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT bundle diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index 24e7a05f7..c23315b4a 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-RC1 + 1.17.10-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -30,14 +30,14 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-impl ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT io.fd.hc2vpp.vpp.classifier vpp-classifier-api - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/vpp-integration/api-docs/pom.xml b/vpp-integration/api-docs/pom.xml index 01a377f47..cb1f1ac61 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-RC1 + 1.17.10-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.docs api-docs pom - 1.17.10-RC1 + 1.17.10-SNAPSHOT core diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml index 7201471c8..086e6f257 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-RC1 + 1.17.10-SNAPSHOT 2.4.7 diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index cae6a6eb8..b04891a00 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-RC1 + 1.17.10-SNAPSHOT ../../common/minimal-distribution-parent @@ -27,25 +27,25 @@ io.fd.hc2vpp.integration vpp-integration-distribution ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT io.fd.honeycomb.infra.distro.Main - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 - 1.17.10-RC1 + 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 io.fd.hc2vpp.common.integration.VppCommonModule, diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index 5d42dc4de..1bdd655b1 100644 --- a/vpp-integration/pom.xml +++ b/vpp-integration/pom.xml @@ -19,14 +19,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.integration vpp-integration ${project.artifactId} - 1.17.10-RC1 + 1.17.10-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 491aa9069..90ca2da46 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-RC1 + 1.17.10-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.management vpp-management-api - 1.17.10-RC1 + 1.17.10-SNAPSHOT \ No newline at end of file diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index e3b8dec12..f2d918037 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-RC1 + 1.17.10-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -29,7 +29,7 @@ io.fd.hc2vpp.management vpp-management-impl - 1.17.10-RC1 + 1.17.10-SNAPSHOT diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index f80d0a29f..8b5fa751b 100644 --- a/vpp-management/pom.xml +++ b/vpp-management/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.10-RC1 + 1.17.10-SNAPSHOT ../common/hc2vpp-parent @@ -31,7 +31,7 @@ io.fd.hc2vpp.management vpp-management-aggregator ${project.artifactId} - 1.17.10-RC1 + 1.17.10-SNAPSHOT Aggregator for Hc2vpp vpp-management plugin -- cgit 1.2.3-korg