From 0c7caef96d2a3bf9e9175a74f096da2e7263225a Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 10 Jan 2018 11:05:35 +0100 Subject: Set hc2vpp version back to 1.18.01-SNAPSHOT Also sets honeycomb DEB/RPM package version to 1.18.01-RC2~$BUILD_NUMBER Change-Id: I7d1916b9e464d957d55b620e746cf763c83943a8 Signed-off-by: Marek Gradzki --- acl/acl-api/pom.xml | 4 ++-- acl/acl-impl/pom.xml | 4 ++-- acl/pom.xml | 4 ++-- bgp/bgp-prefix-sid/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 ++-- mpls/api/pom.xml | 4 ++-- mpls/impl/pom.xml | 4 ++-- mpls/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 ++-- 74 files changed, 170 insertions(+), 170 deletions(-) diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index f377f3ef0..641bd6e55 100644 --- a/acl/acl-api/pom.xml +++ b/acl/acl-api/pom.xml @@ -16,7 +16,7 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.acl acl-api acl-api - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index d71d5de98..4a18f7a0d 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -20,14 +20,14 @@ io.fd.hc2vpp.common impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.acl acl-impl - 1.18.01-RC1 + 1.18.01-SNAPSHOT 18.01-SNAPSHOT diff --git a/acl/pom.xml b/acl/pom.xml index e9306f158..51e716043 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent acl-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT acl-aggregator pom 4.0.0 diff --git a/bgp/bgp-prefix-sid/pom.xml b/bgp/bgp-prefix-sid/pom.xml index aae097a51..15587bdbd 100644 --- a/bgp/bgp-prefix-sid/pom.xml +++ b/bgp/bgp-prefix-sid/pom.xml @@ -5,7 +5,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -13,7 +13,7 @@ io.fd.hc2vpp.bgp bgp-prefix-sid ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index c6666a514..4e1e8f0b1 100644 --- a/bgp/inet/pom.xml +++ b/bgp/inet/pom.xml @@ -5,7 +5,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -13,7 +13,7 @@ io.fd.hc2vpp.bgp bgp-inet ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/bgp/pom.xml b/bgp/pom.xml index 436dedd4a..8afc48634 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.bgp bgp-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index e23e0e329..a980a5467 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common api-parent ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT pom diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index 739848bcf..33660e458 100644 --- a/common/hc2vpp-parent/pom.xml +++ b/common/hc2vpp-parent/pom.xml @@ -7,13 +7,13 @@ io.fd.honeycomb.common honeycomb-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT io.fd.hc2vpp.common hc2vpp-parent ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT pom \ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index d313bd2c4..2883c92df 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common impl-parent ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT pom @@ -23,7 +23,7 @@ io.fd.honeycomb.common impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT pom import diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index ab2fd140e..b5e7464c4 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.18.01-RC1 + 1.18.01-SNAPSHOT ../impl-parent io.fd.hc2vpp.common minimal-distribution-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} pom @@ -29,7 +29,7 @@ io.fd.honeycomb.common minimal-distribution-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT pom import @@ -129,7 +129,7 @@ io.fd.honeycomb.common common-scripts - 1.18.01-RC1 + 1.18.01-SNAPSHOT @@ -142,7 +142,7 @@ io.fd.honeycomb.common minimal-assembly-descriptor - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index e4816ee6a..ecada167c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT hc2vpp-parent io.fd.hc2vpp.common hc2vpp-common-aggregator - 1.18.01-RC1 + 1.18.01-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 03ef3db85..e84186d0c 100644 --- a/dhcp/dhcp-api/pom.xml +++ b/dhcp/dhcp-api/pom.xml @@ -16,7 +16,7 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-api dhcp-api - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 2b0153dc5..a861de1c2 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.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-impl dhcp-impl - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle @@ -69,7 +69,7 @@ io.fd.honeycomb translate-impl - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/dhcp/pom.xml b/dhcp/pom.xml index 3e69e843f..fc7124ac6 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent dhcp-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT dhcp-aggregator pom 4.0.0 diff --git a/interface-role/api/pom.xml b/interface-role/api/pom.xml index 4039d9b23..97a075b00 100644 --- a/interface-role/api/pom.xml +++ b/interface-role/api/pom.xml @@ -5,14 +5,14 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.iface.role api - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index cb7643d38..ea08e4a24 100644 --- a/interface-role/impl/pom.xml +++ b/interface-role/impl/pom.xml @@ -23,13 +23,13 @@ io.fd.hc2vpp.common impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/impl-parent io.fd.hc2vpp.iface.role impl - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} diff --git a/interface-role/pom.xml b/interface-role/pom.xml index 871eeb4c6..a50253c43 100644 --- a/interface-role/pom.xml +++ b/interface-role/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent @@ -14,7 +14,7 @@ io.fd.hc2vpp.iface.role interface-role-aggregator pom - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 272b1d148..1eef35e51 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 612a5506f..faffd9fb7 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/impl-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/ioam/pom.xml b/ioam/pom.xml index fd28f88c4..ce776332b 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.ioam vppioam-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index b33f4ce37..65f1e7ec0 100644 --- a/it/api-coverage/pom.xml +++ b/it/api-coverage/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.it api-coverage - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index f0fd744c1..3ee9f94c7 100644 --- a/it/api-test/pom.xml +++ b/it/api-test/pom.xml @@ -21,13 +21,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 api-test - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} diff --git a/it/pom.xml b/it/pom.xml index 13bca3f18..0818f1d9e 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/l3/api/pom.xml b/l3/api/pom.xml index f7200e4bf..ce895a1ec 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.l3 l3-api ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index c92b3f3c4..544cd9076 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-impl ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/l3/pom.xml b/l3/pom.xml index 4ff42550d..fd73019f3 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent pom diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index 2c134a259..5199d1d7a 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-utils ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index 75461515f..3b9992e2f 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent @@ -26,12 +26,12 @@ io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle io.fd.honeycomb - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 01fed05ed..d55bebf22 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index 0b7747c5e..ec97cca8e 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.lisp lisp-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/mpls/api/pom.xml b/mpls/api/pom.xml index d20040c36..17937837d 100644 --- a/mpls/api/pom.xml +++ b/mpls/api/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.mpls mpls-api ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/mpls/impl/pom.xml b/mpls/impl/pom.xml index fa0e429cd..4005e6368 100644 --- a/mpls/impl/pom.xml +++ b/mpls/impl/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent io.fd.hc2vpp.mpls mpls-impl ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/mpls/pom.xml b/mpls/pom.xml index e3631f1a0..52cd9bd85 100644 --- a/mpls/pom.xml +++ b/mpls/pom.xml @@ -20,13 +20,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.mpls mpls-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index 0a29a887c..4fc9426ca 100644 --- a/nat/nat-api/pom.xml +++ b/nat/nat-api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent @@ -25,11 +25,11 @@ io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 4596475cf..653695d28 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.18.01-RC1 + 1.18.01-SNAPSHOT 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle - 1.18.01-RC1 - 1.18.01-RC1 + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT diff --git a/nat/pom.xml b/nat/pom.xml index 56a095420..08e264b01 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nat nat-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index ec616a04e..79638db05 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 743db7297..91b222ee5 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/impl-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/nsh/pom.xml b/nsh/pom.xml index 2cd247a44..467d838ed 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nsh vppnsh-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index 6f3c8de62..225ea2cda 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 dfc702439..2693fd0a9 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -11,8 +11,8 @@ # Stable versions # # echo RC1~$BUILD_NUMBER -echo RC1 -# echo RC2~$BUILD_NUMBER +# echo RC1 +echo RC2~$BUILD_NUMBER # echo RC2 # # Release snapshot (1.18.01~XXX, 1.18.01.1~XXX, ...) diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index cf76e67b3..8691b68b8 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.18.01-RC1-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.18.01-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 45f0023e8..50a326a91 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT common/hc2vpp-parent io.fd.hc2vpp hc2vpp-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index e39e0f837..91ad40ba8 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp release-notes-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/pom.xml b/routing/pom.xml index f7299e4c9..1f56016d1 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.routing routing-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index d5039041a..136f37155 100644 --- a/routing/routing-api/pom.xml +++ b/routing/routing-api/pom.xml @@ -18,14 +18,14 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.routing routing-api - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index d0718e205..59fff2a80 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.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.routing routing-impl - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/samples/pom.xml b/samples/pom.xml index 8ba5bcb8c..7541e5075 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index bf84a5d7f..4ae01a7c8 100644 --- a/samples/samples-api/pom.xml +++ b/samples/samples-api/pom.xml @@ -5,7 +5,7 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent 4.0.0 @@ -13,7 +13,7 @@ io.fd.hc2vpp.common samples-api ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 951b4e2aa..1bb69f4c7 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.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 samples-impl ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 5d427e6cc..c1c30acfc 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index 79f590ff7..b08d6fdec 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.v3po v3po-aggregator - 1.18.01-RC1 + 1.18.01-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index 258f87b9b..b2d7a194f 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 29d86b367..2b0785e4c 100644 --- a/vpp-classifier/api/pom.xml +++ b/vpp-classifier/api/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-api ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT bundle diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index 9346c24a6..038f28fa3 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.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -30,14 +30,14 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-impl ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT io.fd.hc2vpp.vpp.classifier vpp-classifier-api - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/vpp-integration/api-docs/pom.xml b/vpp-integration/api-docs/pom.xml index 36b0ee936..a0c884095 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.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.docs api-docs pom - 1.18.01-RC1 + 1.18.01-SNAPSHOT core diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml index 825cae1bb..3d73af7f0 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.18.01-RC1 + 1.18.01-SNAPSHOT 2.4.7 diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index 1b764b6f8..29a3970c0 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.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/minimal-distribution-parent @@ -27,25 +27,25 @@ io.fd.hc2vpp.integration vpp-integration-distribution ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT io.fd.honeycomb.infra.distro.Main - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 - 1.18.01-RC1 + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT + 1.18.01-SNAPSHOT io.fd.hc2vpp.common.integration.VppCommonModule, diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index f32af4a71..fbd888a09 100644 --- a/vpp-integration/pom.xml +++ b/vpp-integration/pom.xml @@ -19,14 +19,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.integration vpp-integration ${project.artifactId} - 1.18.01-RC1 + 1.18.01-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 094800cef..630e2adcc 100644 --- a/vpp-management/api/pom.xml +++ b/vpp-management/api/pom.xml @@ -23,11 +23,11 @@ io.fd.hc2vpp.common api-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.management vpp-management-api - 1.18.01-RC1 + 1.18.01-SNAPSHOT \ No newline at end of file diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index 98f33f4d2..81ffd7407 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.18.01-RC1 + 1.18.01-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -29,7 +29,7 @@ io.fd.hc2vpp.management vpp-management-impl - 1.18.01-RC1 + 1.18.01-SNAPSHOT diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index 3b95ea767..93c57b0a9 100644 --- a/vpp-management/pom.xml +++ b/vpp-management/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.01-RC1 + 1.18.01-SNAPSHOT ../common/hc2vpp-parent @@ -31,7 +31,7 @@ io.fd.hc2vpp.management vpp-management-aggregator ${project.artifactId} - 1.18.01-RC1 + 1.18.01-SNAPSHOT Aggregator for Hc2vpp vpp-management plugin -- cgit 1.2.3-korg