From a5ed73b7ffa04b50474c9ff778a8e3914dc462c5 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 7 May 2019 15:21:20 +0200 Subject: Set Hc2vpp version to 1.19.04.1-SNAPSHOT Change-Id: I4d30b1b6ff4a6ef341e0a73f1e9598ba5271ed20 Signed-off-by: Michal Cmarada --- 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 ++-- fib-management/fib-management-api/pom.xml | 4 ++-- fib-management/fib-management-impl/pom.xml | 4 ++-- fib-management/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 ++-- ipsec/ipsec-api/pom.xml | 6 +++--- ipsec/ipsec-impl/pom.xml | 4 ++-- ipsec/pom.xml | 4 ++-- it/api-coverage/pom.xml | 4 ++-- it/api-test/pom.xml | 4 ++-- it/jvpp-benchmark/pom.xml | 4 ++-- it/pom.xml | 2 +- jvpp-version | 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 | 8 +++---- packaging/rpm/version | 2 +- pom.xml | 4 ++-- release-notes/pom.xml | 6 +++--- 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 ++-- srv6/pom.xml | 4 ++-- srv6/srv6-api/pom.xml | 4 ++-- srv6/srv6-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 +- 86 files changed, 187 insertions(+), 187 deletions(-) diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 2f04b253e..f7a2d608f 100644 --- a/acl/acl-api/pom.xml +++ b/acl/acl-api/pom.xml @@ -16,7 +16,7 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.acl acl-api acl-api - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 7f9c681d1..b638b7262 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -20,14 +20,14 @@ io.fd.hc2vpp.common impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.acl acl-impl - 1.19.04 + 1.19.04.1-SNAPSHOT 19.04 diff --git a/acl/pom.xml b/acl/pom.xml index 0866b203b..5c3955f20 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent acl-aggregator - 1.19.04 + 1.19.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 5a2e31ea8..54158f3b7 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.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -13,7 +13,7 @@ io.fd.hc2vpp.bgp bgp-prefix-sid ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index fba4c5432..81ddc59c8 100644 --- a/bgp/inet/pom.xml +++ b/bgp/inet/pom.xml @@ -5,7 +5,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -13,7 +13,7 @@ io.fd.hc2vpp.bgp bgp-inet ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/bgp/pom.xml b/bgp/pom.xml index 459f37bb9..a27df8816 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.bgp bgp-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index 4da116431..bd1d1cec5 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common api-parent ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT pom diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index a43578d89..b76ca67d4 100644 --- a/common/hc2vpp-parent/pom.xml +++ b/common/hc2vpp-parent/pom.xml @@ -7,17 +7,17 @@ io.fd.honeycomb.common honeycomb-parent - 1.19.04 + 1.19.04.1-SNAPSHOT io.fd.hc2vpp.common hc2vpp-parent ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT pom - 1.19.04 + 1.19.04.1-SNAPSHOT \ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index 80a3f5270..a8bf7a4d5 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../hc2vpp-parent io.fd.hc2vpp.common impl-parent ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT pom @@ -23,7 +23,7 @@ io.fd.honeycomb.common impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT pom import diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 6d6d40a23..853965ca6 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.19.04 + 1.19.04.1-SNAPSHOT ../impl-parent io.fd.hc2vpp.common minimal-distribution-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom diff --git a/common/pom.xml b/common/pom.xml index 0c7050288..d628b9976 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT hc2vpp-parent io.fd.hc2vpp.common hc2vpp-common-aggregator - 1.19.04 + 1.19.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 1fcf65c40..519259edb 100644 --- a/dhcp/dhcp-api/pom.xml +++ b/dhcp/dhcp-api/pom.xml @@ -16,7 +16,7 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-api dhcp-api - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 222854aab..29d030bdb 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.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-impl dhcp-impl - 1.19.04 + 1.19.04.1-SNAPSHOT bundle @@ -67,7 +67,7 @@ io.fd.honeycomb translate-impl - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/dhcp/pom.xml b/dhcp/pom.xml index ae94b3130..daa90ec26 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent dhcp-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT dhcp-aggregator pom 4.0.0 diff --git a/fib-management/fib-management-api/pom.xml b/fib-management/fib-management-api/pom.xml index f7d174cb2..577fb30ba 100644 --- a/fib-management/fib-management-api/pom.xml +++ b/fib-management/fib-management-api/pom.xml @@ -18,14 +18,14 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.fib.management fib-management-api - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} bundle diff --git a/fib-management/fib-management-impl/pom.xml b/fib-management/fib-management-impl/pom.xml index 1a2410e23..9b9031dc7 100644 --- a/fib-management/fib-management-impl/pom.xml +++ b/fib-management/fib-management-impl/pom.xml @@ -20,14 +20,14 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.fib.management fib-management-impl - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} bundle diff --git a/fib-management/pom.xml b/fib-management/pom.xml index 659340c70..06f8e6557 100644 --- a/fib-management/pom.xml +++ b/fib-management/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.routing fib-management-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/interface-role/api/pom.xml b/interface-role/api/pom.xml index a0c326772..48da4134c 100644 --- a/interface-role/api/pom.xml +++ b/interface-role/api/pom.xml @@ -5,14 +5,14 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.iface.role api - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index 846362ce1..006428715 100644 --- a/interface-role/impl/pom.xml +++ b/interface-role/impl/pom.xml @@ -23,13 +23,13 @@ io.fd.hc2vpp.common impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/impl-parent io.fd.hc2vpp.iface.role impl - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} diff --git a/interface-role/pom.xml b/interface-role/pom.xml index da3ee60df..c9a425a2f 100644 --- a/interface-role/pom.xml +++ b/interface-role/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent @@ -14,7 +14,7 @@ io.fd.hc2vpp.iface.role interface-role-aggregator pom - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 21fb59422..c6de6ea2d 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 9b4d8c102..3151ea169 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/impl-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/ioam/pom.xml b/ioam/pom.xml index 27cf4d3f3..9a2175c38 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.ioam vppioam-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/ipsec/ipsec-api/pom.xml b/ipsec/ipsec-api/pom.xml index d290540c5..50ee24f86 100644 --- a/ipsec/ipsec-api/pom.xml +++ b/ipsec/ipsec-api/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent @@ -27,11 +27,11 @@ io.fd.hc2vpp.ipsec ipsec-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/ipsec/ipsec-impl/pom.xml b/ipsec/ipsec-impl/pom.xml index 0b46f73e6..93529756a 100644 --- a/ipsec/ipsec-impl/pom.xml +++ b/ipsec/ipsec-impl/pom.xml @@ -20,14 +20,14 @@ io.fd.hc2vpp.common vpp-impl-parent ../../vpp-common/vpp-impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT 4.0.0 io.fd.hc2vpp.ipsec ipsec-impl ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/ipsec/pom.xml b/ipsec/pom.xml index 47c511ff9..ec13ec975 100644 --- a/ipsec/pom.xml +++ b/ipsec/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.ipsec ipsec-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index ba4257c36..5fda62e93 100644 --- a/it/api-coverage/pom.xml +++ b/it/api-coverage/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/impl-parent 4.0.0 io.fd.hc2vpp.it api-coverage - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index 04bd6f3f0..fbc152e3b 100644 --- a/it/api-test/pom.xml +++ b/it/api-test/pom.xml @@ -21,13 +21,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 api-test - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} diff --git a/it/jvpp-benchmark/pom.xml b/it/jvpp-benchmark/pom.xml index afbd530d4..5851dea84 100644 --- a/it/jvpp-benchmark/pom.xml +++ b/it/jvpp-benchmark/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/hc2vpp-parent 4.0.0 io.fd.hc2vpp.it jvpp-benchmark - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} diff --git a/it/pom.xml b/it/pom.xml index 0a5dff7f5..1d8265fcc 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/jvpp-version b/jvpp-version index 278d5d218..7dfd4b314 100755 --- a/jvpp-version +++ b/jvpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo '19.04-release' +echo 'RELEASE' # Determines which JVPP version to use in hc2vpp-integration job. # 'RELEASE' will use the latest JVPP in the respective branch. diff --git a/l3/api/pom.xml b/l3/api/pom.xml index 8f0f87051..5d8022215 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.l3 l3-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 846ba40c2..127753afd 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-impl ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/l3/pom.xml b/l3/pom.xml index 8c94aabf4..473938f2d 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent pom diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index 3c0cf50fb..ac0daed09 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-utils ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index a59ad7ad6..488de2744 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent @@ -26,11 +26,11 @@ io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 0972bdb71..238e75715 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index 34b6bd598..91f1673a5 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.lisp lisp-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/mpls/api/pom.xml b/mpls/api/pom.xml index 674b9be7e..65365adcb 100644 --- a/mpls/api/pom.xml +++ b/mpls/api/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.mpls mpls-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/mpls/impl/pom.xml b/mpls/impl/pom.xml index eafa8d606..2d8324ae5 100644 --- a/mpls/impl/pom.xml +++ b/mpls/impl/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent io.fd.hc2vpp.mpls mpls-impl ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/mpls/pom.xml b/mpls/pom.xml index cc2eae6a3..cde7aa95d 100644 --- a/mpls/pom.xml +++ b/mpls/pom.xml @@ -20,13 +20,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.mpls mpls-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index 7ce6432ae..d86308ec1 100644 --- a/nat/nat-api/pom.xml +++ b/nat/nat-api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent @@ -25,11 +25,11 @@ io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index ce895910e..480379650 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.19.04 + 1.19.04.1-SNAPSHOT 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/nat/pom.xml b/nat/pom.xml index 9706a6390..f86f8a864 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nat nat-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index 7463baafd..a3078a16e 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 687eb9896..dc78cfd9d 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/impl-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/nsh/pom.xml b/nsh/pom.xml index df608c875..48e18a043 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.nsh vppnsh-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index 3a511f708..0f12d28f6 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 - * 19.04 release + * 19.04.1 release -- mcmarada Thu, 18 Oct 2018 13:42:07 +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 9f2e56d9b..2c33de070 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -17,8 +17,8 @@ # echo RC3~$BUILD_NUMBER # echo RC3 # -# Release snapshot (1.19.04~XXX, 1.19.04.1~XXX, ...) -# echo RELEASE~$BUILD_NUMBER +# Release snapshot (1.19.04.1-SNAPSHOT~XXX, 1.19.04.1-SNAPSHOT.1~XXX, ...) +echo RELEASE~$BUILD_NUMBER # -# Release version (1.19.04, 1.19.04.1, ...) -echo RELEASE \ No newline at end of file +# Release version (1.19.04.1-SNAPSHOT, 1.19.04.1-SNAPSHOT.1, ...) +# echo RELEASE \ No newline at end of file diff --git a/packaging/rpm/version b/packaging/rpm/version index df76e1bcb..86b10feb7 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.19.04 +echo 1.19.04.1 diff --git a/pom.xml b/pom.xml index c1b50724c..78c84f9df 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT common/hc2vpp-parent io.fd.hc2vpp hc2vpp-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 104490dcc..5679effe1 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp release-notes-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 @@ -107,7 +107,7 @@ making it much easier when bumping versions --> ${project.version} 19.04 - 1-19-04 + 1.19.04.1-SNAPSHOT 11701 stable/1904 oxygen diff --git a/routing/pom.xml b/routing/pom.xml index ad28a1bd9..3f49f18bf 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.routing routing-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index 3692ea47e..d492f507f 100644 --- a/routing/routing-api/pom.xml +++ b/routing/routing-api/pom.xml @@ -18,14 +18,14 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent 4.0.0 io.fd.hc2vpp.routing routing-api - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 165d6edfc..521f0f270 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.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.routing routing-impl - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} bundle diff --git a/samples/pom.xml b/samples/pom.xml index 8b262728f..052000007 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent 4.0.0 diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index 82eff4d1d..41f6a6f8b 100644 --- a/samples/samples-api/pom.xml +++ b/samples/samples-api/pom.xml @@ -5,7 +5,7 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent 4.0.0 @@ -13,7 +13,7 @@ io.fd.hc2vpp.common samples-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 8b3430f98..965994066 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.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent 4.0.0 samples-impl ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT diff --git a/srv6/pom.xml b/srv6/pom.xml index 268d0a6e3..2fd107d24 100644 --- a/srv6/pom.xml +++ b/srv6/pom.xml @@ -20,13 +20,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.srv6 srv6-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/srv6/srv6-api/pom.xml b/srv6/srv6-api/pom.xml index 083416ac6..4bba213c7 100644 --- a/srv6/srv6-api/pom.xml +++ b/srv6/srv6-api/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent io.fd.hc2vpp.srv6 srv6-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/srv6/srv6-impl/pom.xml b/srv6/srv6-impl/pom.xml index 83f65b586..2d13a1651 100644 --- a/srv6/srv6-impl/pom.xml +++ b/srv6/srv6-impl/pom.xml @@ -21,14 +21,14 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent io.fd.hc2vpp.srv6 srv6-impl ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 82aa719a8..f541e964e 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index d5dd9d95d..86300e70e 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../common/hc2vpp-parent io.fd.hc2vpp.v3po v3po-aggregator - 1.19.04 + 1.19.04.1-SNAPSHOT ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index 657fa9239..a109fcf1e 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 34cafb3f6..424c48ce2 100644 --- a/vpp-classifier/api/pom.xml +++ b/vpp-classifier/api/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common api-parent - 1.19.04 + 1.19.04.1-SNAPSHOT ../../common/api-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-api ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT bundle diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index d6d67afbf..1f140997b 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.19.04 + 1.19.04.1-SNAPSHOT ../../vpp-common/vpp-impl-parent @@ -30,14 +30,14 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-impl ${project.artifactId} - 1.19.04 + 1.19.04.1-SNAPSHOT io.fd.hc2vpp.vpp.classifier vpp-classifier-api - 1.19.04 + 1.19.04.1-SNAPSHOT