From 6223fd97f1113ad6dfc13fbc93fa911b460cf091 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 30 Apr 2018 10:20:49 +0200 Subject: Set Hc2vpp version to 1.18.04.1-SNAPSHOT Change-Id: Ie2307b319b361b9dc29e5293c3163e4f53856311 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 | 6 +++--- common/impl-parent/pom.xml | 6 +++--- common/minimal-distribution-parent/pom.xml | 4 ++-- 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 | 6 +++--- nat/pom.xml | 4 ++-- nsh/api/pom.xml | 4 ++-- nsh/impl/pom.xml | 4 ++-- nsh/pom.xml | 4 ++-- packaging/deb/common/prepare.sh | 2 +- packaging/rpm/hc2vpp_version | 4 ++-- packaging/rpm/release | 4 ++-- packaging/rpm/version | 2 +- pom.xml | 4 ++-- release-notes/pom.xml | 4 ++-- routing/pom.xml | 4 ++-- routing/routing-api/pom.xml | 4 ++-- routing/routing-impl/pom.xml | 4 ++-- 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 | 4 ++-- 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 | 32 ++++++++++++++-------------- 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 +- 75 files changed, 162 insertions(+), 162 deletions(-) diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 8f5c49260..d167e48aa 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.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.acl acl-api acl-api - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 974aadc23..09a4ea2c5 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.04 + 1.18.04.1-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.acl acl-impl - 1.18.04 + 1.18.04.1-SNAPSHOT 18.04 diff --git a/acl/pom.xml b/acl/pom.xml index fec015e81..d4f324db2 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent acl-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT acl-aggregator pom 4.0.0 diff --git a/bgp/bgp-prefix-sid/pom.xml b/bgp/bgp-prefix-sid/pom.xml index 0a93d597e..d131c8486 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.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -13,7 +13,7 @@ io.fd.hc2vpp.bgp bgp-prefix-sid ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index c2adcdc78..8aed04e8d 100644 --- a/bgp/inet/pom.xml +++ b/bgp/inet/pom.xml @@ -5,7 +5,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -13,7 +13,7 @@ io.fd.hc2vpp.bgp bgp-inet ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/bgp/pom.xml b/bgp/pom.xml index 565cd57c3..26fba2487 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.bgp bgp-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index b7a376d14..9ea40aebc 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.04 + 1.18.04.1-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common api-parent ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT pom diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index e23464b4e..b2ab51fbb 100644 --- a/common/hc2vpp-parent/pom.xml +++ b/common/hc2vpp-parent/pom.xml @@ -7,17 +7,17 @@ io.fd.honeycomb.common honeycomb-parent - 1.18.04 + 1.18.04.1-SNAPSHOT io.fd.hc2vpp.common hc2vpp-parent ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT pom - 1.18.04 + 1.18.04.1-SNAPSHOT \ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index cc92f9c08..b95f37b88 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.04 + 1.18.04.1-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common impl-parent ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT pom @@ -23,7 +23,7 @@ io.fd.honeycomb.common impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT pom import diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 9434e13da..5e7b07b60 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.04 + 1.18.04.1-SNAPSHOT ../impl-parent io.fd.hc2vpp.common minimal-distribution-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} pom diff --git a/common/pom.xml b/common/pom.xml index 5f4f2545e..fd5506cbf 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT hc2vpp-parent io.fd.hc2vpp.common hc2vpp-common-aggregator - 1.18.04 + 1.18.04.1-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 dadf67b61..6061bd3e2 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.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-api dhcp-api - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 6cbdc62b1..355da6846 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.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-impl dhcp-impl - 1.18.04 + 1.18.04.1-SNAPSHOT bundle @@ -67,7 +67,7 @@ io.fd.honeycomb translate-impl - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/dhcp/pom.xml b/dhcp/pom.xml index 8aff781fc..93317faea 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent dhcp-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT dhcp-aggregator pom 4.0.0 diff --git a/interface-role/api/pom.xml b/interface-role/api/pom.xml index 44b2eaeb5..2b2f72346 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.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.iface.role api - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index d5516281c..14d2d9ce1 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.04 + 1.18.04.1-SNAPSHOT ../../common/impl-parent io.fd.hc2vpp.iface.role impl - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} diff --git a/interface-role/pom.xml b/interface-role/pom.xml index 5bdbf6882..09afebe81 100644 --- a/interface-role/pom.xml +++ b/interface-role/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent @@ -14,7 +14,7 @@ io.fd.hc2vpp.iface.role interface-role-aggregator pom - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index ef18747b4..3316b1e41 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 79509193f..37c8c1ca6 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../common/impl-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/ioam/pom.xml b/ioam/pom.xml index 12a2208aa..42cfdf019 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.ioam vppioam-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index 2f0a6137b..911e6770f 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.04 + 1.18.04.1-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.it api-coverage - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index 40a286266..ebb1f2ef6 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.04 + 1.18.04.1-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 api-test - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} diff --git a/it/pom.xml b/it/pom.xml index 8754c6c51..cea97edde 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/l3/api/pom.xml b/l3/api/pom.xml index 751e14012..48fd678b8 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ io.fd.hc2vpp.common api-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.l3 l3-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 6abbe57a0..fe87a8159 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-impl ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/l3/pom.xml b/l3/pom.xml index 8ce2c5eba..a6fa8f47a 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent pom diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index da7e1264e..6d0d568d8 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-utils ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index a7d1062b9..d23c585d7 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent @@ -26,12 +26,12 @@ io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle io.fd.honeycomb - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 2f07ca807..fa50d2228 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index 8a5d16743..92732f27b 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.lisp lisp-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/mpls/api/pom.xml b/mpls/api/pom.xml index 5855aa625..4013c3b6a 100644 --- a/mpls/api/pom.xml +++ b/mpls/api/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common api-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.mpls mpls-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/mpls/impl/pom.xml b/mpls/impl/pom.xml index cef79a23a..5bb0b6f75 100644 --- a/mpls/impl/pom.xml +++ b/mpls/impl/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent io.fd.hc2vpp.mpls mpls-impl ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/mpls/pom.xml b/mpls/pom.xml index 3d6fda6f4..cfb209ce2 100644 --- a/mpls/pom.xml +++ b/mpls/pom.xml @@ -20,13 +20,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.mpls mpls-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index 757249a41..9685d8320 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.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent @@ -25,11 +25,11 @@ io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 7cf4a72e0..37007bd10 100644 --- a/nat/nat2vpp/pom.xml +++ b/nat/nat2vpp/pom.xml @@ -18,18 +18,18 @@ io.fd.hc2vpp.common vpp-impl-parent ../../vpp-common/vpp-impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/nat/pom.xml b/nat/pom.xml index 4bf436669..40010b1e8 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nat nat-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index 74ff87268..96ea7c884 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index a3a862e23..5846c71e9 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../common/impl-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/nsh/pom.xml b/nsh/pom.xml index 5ac37143e..085f2611c 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nsh vppnsh-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index b58b98ad6..585c3a27e 100755 --- a/packaging/deb/common/prepare.sh +++ b/packaging/deb/common/prepare.sh @@ -35,7 +35,7 @@ cp ${SOURCE_DIR}/$3 ${BUILD_DIR} cat <> ${BUILD_DIR}/debian/changelog honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low - * 18.04 release + * 18.04.1 release -- mgradzki Mon, 23 Feb 2016 09:41:37 +0200 EOT diff --git a/packaging/rpm/hc2vpp_version b/packaging/rpm/hc2vpp_version index fdecc27fb..a084540e3 100755 --- a/packaging/rpm/hc2vpp_version +++ b/packaging/rpm/hc2vpp_version @@ -6,7 +6,7 @@ DIR_NAME=$(dirname $0) VERSION=`$DIR_NAME/version` -# echo "${VERSION}-SNAPSHOT" +echo "${VERSION}-SNAPSHOT" # echo "${VERSION}-RC1" # echo "${VERSION}-RC2" -echo "${VERSION}" +# echo "${VERSION}" diff --git a/packaging/rpm/release b/packaging/rpm/release index 3425b44f8..aacfba096 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -16,7 +16,7 @@ # echo RC2 # # Release snapshot (1.18.04~XXX, 1.18.04.1~XXX, ...) -# echo RELEASE~$BUILD_NUMBER +echo RELEASE~$BUILD_NUMBER # # Release version (1.18.04, 1.18.04.1, ...) -echo RELEASE \ No newline at end of file +# echo RELEASE \ No newline at end of file diff --git a/packaging/rpm/version b/packaging/rpm/version index 9eab6983f..3a0ad5971 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.18.04 +echo 1.18.04.1 diff --git a/pom.xml b/pom.xml index 9d345f650..1820d4740 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT common/hc2vpp-parent io.fd.hc2vpp hc2vpp-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 4a90c94ed..0c410e103 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp release-notes-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/pom.xml b/routing/pom.xml index 04033a8ba..8d8c23d85 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.routing routing-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index 9bd3a1e74..5490949a3 100644 --- a/routing/routing-api/pom.xml +++ b/routing/routing-api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.routing routing-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 17d0ccfdf..f744c2eb3 100644 --- a/routing/routing-impl/pom.xml +++ b/routing/routing-impl/pom.xml @@ -20,7 +20,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -28,7 +28,7 @@ io.fd.hc2vpp.routing routing-impl ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/samples/pom.xml b/samples/pom.xml index 44ae255f0..378535b99 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index 58d166247..121ef54f6 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.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent 4.0.0 @@ -13,7 +13,7 @@ io.fd.hc2vpp.common samples-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 36664f38c..dc87964c1 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.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 samples-impl ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 0245d87bc..e36aadf6f 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index f418614b1..e4f46b6ea 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.v3po v3po-aggregator - 1.18.04 + 1.18.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index 9019c441e..1ce57be48 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 6f528eb77..32c87098f 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.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT bundle diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index c57548d07..ca1802815 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.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -30,14 +30,14 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-impl ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT io.fd.hc2vpp.vpp.classifier vpp-classifier-api - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/vpp-integration/api-docs/pom.xml b/vpp-integration/api-docs/pom.xml index 44b2e801a..e70668532 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.04 + 1.18.04.1-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 @@ -30,7 +30,7 @@ api-docs ${project.artifactId} pom - 1.18.04 + 1.18.04.1-SNAPSHOT core diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml index 547af5126..19a6caeff 100644 --- a/vpp-integration/api-docs/scripts/pom.xml +++ b/vpp-integration/api-docs/scripts/pom.xml @@ -23,7 +23,7 @@ io.fd.hc2vpp.docs scripts ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT 2.4.7 diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index 3c0a3f249..d25c47f66 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.04 + 1.18.04.1-SNAPSHOT ../../common/minimal-distribution-parent @@ -27,24 +27,24 @@ io.fd.hc2vpp.integration vpp-integration-distribution ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT io.fd.honeycomb.infra.distro.Main - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 - 1.18.04 + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT + 1.18.04.1-SNAPSHOT io.fd.hc2vpp.common.integration.VppCommonModule, diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index b6f2cd489..8718efc83 100644 --- a/vpp-integration/pom.xml +++ b/vpp-integration/pom.xml @@ -19,14 +19,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.integration vpp-integration ${project.artifactId} - 1.18.04 + 1.18.04.1-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 472e95c67..09b15a1d4 100644 --- a/vpp-management/api/pom.xml +++ b/vpp-management/api/pom.xml @@ -23,14 +23,14 @@ io.fd.hc2vpp.common api-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.management vpp-management-api ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index 01c2e9d45..611c176bc 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.04 + 1.18.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -30,7 +30,7 @@ io.fd.hc2vpp.management vpp-management-impl ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index d0a3b7d9c..f3556d68d 100644 --- a/vpp-management/pom.xml +++ b/vpp-management/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.18.04 + 1.18.04.1-SNAPSHOT ../common/hc2vpp-parent @@ -31,7 +31,7 @@ io.fd.hc2vpp.management vpp-management-aggregator ${project.artifactId} - 1.18.04 + 1.18.04.1-SNAPSHOT Aggregator for Hc2vpp vpp-management plugin diff --git a/vpp-version b/vpp-version index eaacb3a75..fea07c41e 100755 --- a/vpp-version +++ b/vpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo '18.04-release' +echo '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