From e8e5e4155df5d21530e4b3e421cffa59f0960d99 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 18 Jul 2017 13:21:41 +0200 Subject: Bump hc2vpp version to 1.17.07-RC2 Also updates honeycomb dependencies. Change-Id: I6f2e059d96ba8e85ee7fde5d2cae1b24d8f7699d 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/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 ++-- 65 files changed, 154 insertions(+), 154 deletions(-) diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 87068ccd4..a794d816f 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.acl acl-api acl-api - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 18d1eb92f..e1441d4fa 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/impl-parent 4.0.0 io.fd.hc2vpp.acl acl-impl - 1.17.07-SNAPSHOT + 1.17.07-RC2 17.07-SNAPSHOT diff --git a/acl/pom.xml b/acl/pom.xml index fb0d11ed6..eea20fcb6 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent acl-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 acl-aggregator pom 4.0.0 diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index a570d098b..1f9c152f3 100644 --- a/bgp/inet/pom.xml +++ b/bgp/inet/pom.xml @@ -5,7 +5,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../vpp-common/vpp-impl-parent @@ -13,7 +13,7 @@ io.fd.hc2vpp.bgp bgp-inet ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 diff --git a/bgp/pom.xml b/bgp/pom.xml index a534d2524..b864fb148 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent io.fd.hc2vpp.bgp bgp-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} pom 4.0.0 diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index 15d550949..448b994de 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.07-SNAPSHOT + 1.17.07-RC2 ../hc2vpp-parent io.fd.hc2vpp.common api-parent ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 pom diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index 368d4c798..734bb585c 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.07-SNAPSHOT + 1.17.07-RC2 io.fd.hc2vpp.common hc2vpp-parent ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 pom \ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index 2d9984247..6519d9c20 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.07-SNAPSHOT + 1.17.07-RC2 ../hc2vpp-parent io.fd.hc2vpp.common impl-parent ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 pom @@ -23,7 +23,7 @@ io.fd.honeycomb.common impl-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 pom import diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 00aac6785..5dc5297ce 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.07-SNAPSHOT + 1.17.07-RC2 ../impl-parent io.fd.hc2vpp.common minimal-distribution-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} pom @@ -29,7 +29,7 @@ io.fd.honeycomb.common minimal-distribution-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 pom import @@ -129,7 +129,7 @@ io.fd.honeycomb.common common-scripts - 1.17.07-SNAPSHOT + 1.17.07-RC2 @@ -142,7 +142,7 @@ io.fd.honeycomb.common minimal-assembly-descriptor - 1.17.07-SNAPSHOT + 1.17.07-RC2 diff --git a/common/pom.xml b/common/pom.xml index 10750a0d8..b788db9e5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 hc2vpp-parent io.fd.hc2vpp.common hc2vpp-common-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${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 715451189..a9eb9f8ed 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-api dhcp-api - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 028b394c7..1805dac87 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.07-SNAPSHOT + 1.17.07-RC2 ../../vpp-common/vpp-impl-parent @@ -24,7 +24,7 @@ io.fd.hc2vpp.dhcp dhcp-impl dhcp-impl - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle @@ -69,7 +69,7 @@ io.fd.honeycomb translate-impl - 1.17.07-SNAPSHOT + 1.17.07-RC2 diff --git a/dhcp/pom.xml b/dhcp/pom.xml index 953a75bf4..26195e251 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent dhcp-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 dhcp-aggregator pom 4.0.0 diff --git a/interface-role/api/pom.xml b/interface-role/api/pom.xml index 84c395919..32f5bc983 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent 4.0.0 io.fd.hc2vpp.iface.role api - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index 5f3e9599b..cd608acca 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/impl-parent io.fd.hc2vpp.iface.role impl - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} diff --git a/interface-role/pom.xml b/interface-role/pom.xml index 9493d9164..88c64b754 100644 --- a/interface-role/pom.xml +++ b/interface-role/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent @@ -14,7 +14,7 @@ io.fd.hc2vpp.iface.role interface-role-aggregator pom - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 87187782e..b3c84e14f 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-api ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index e1f8ce243..0b8f9fff9 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../common/impl-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.ioam vppioam-impl ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/ioam/pom.xml b/ioam/pom.xml index f7a9ba500..689b0adb3 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent io.fd.hc2vpp.ioam vppioam-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} pom 4.0.0 diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index 4c939ffeb..6044b724c 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/impl-parent 4.0.0 io.fd.hc2vpp.it api-coverage - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index accd8cf3f..61b7d09df 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/hc2vpp-parent 4.0.0 api-test - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} diff --git a/it/pom.xml b/it/pom.xml index 998d29c1a..33e1e9592 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent 4.0.0 diff --git a/l3/api/pom.xml b/l3/api/pom.xml index 55f1e6d08..56d1cfbab 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ io.fd.hc2vpp.common api-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent io.fd.hc2vpp.l3 l3-api ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 2f5a23f27..0ca056e50 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-impl ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 diff --git a/l3/pom.xml b/l3/pom.xml index f2c1d64f6..9549df3e4 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent pom diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index 580654a1a..77f747b43 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../vpp-common/vpp-impl-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.l3 l3-utils ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index 394857820..e7a251bf2 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent @@ -26,12 +26,12 @@ io.fd.hc2vpp.lisp lisp-api ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle io.fd.honeycomb - 1.17.07-SNAPSHOT + 1.17.07-RC2 diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index f9a366147..0ba1e7dfa 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.lisp lisp2vpp ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/lisp/pom.xml b/lisp/pom.xml index 51f12c4b4..069537e7e 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent io.fd.hc2vpp.lisp lisp-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} pom 4.0.0 diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index d5aa27bc2..ffb1d2920 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent @@ -25,11 +25,11 @@ io.fd.hc2vpp.nat nat-api ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle - 1.17.07-SNAPSHOT + 1.17.07-RC2 diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 7a16ca0e7..5cd97537d 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.07-SNAPSHOT + 1.17.07-RC2 4.0.0 io.fd.hc2vpp.nat nat2vpp ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle - 1.17.07-SNAPSHOT - 1.17.07-SNAPSHOT + 1.17.07-RC2 + 1.17.07-RC2 diff --git a/nat/pom.xml b/nat/pom.xml index 12685a33a..62332a772 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent io.fd.hc2vpp.nat nat-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 nat-aggregator pom 4.0.0 diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index 190e18196..bdb56f3c5 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ io.fd.hc2vpp.common api-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent @@ -26,7 +26,7 @@ io.fd.hc2vpp.nsh vppnsh-api ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 33c79936b..342f7eac9 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common impl-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../common/impl-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.nsh vppnsh-impl ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/nsh/pom.xml b/nsh/pom.xml index abee20e2d..3106fb776 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent io.fd.hc2vpp.nsh vppnsh-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} pom 4.0.0 diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index c34b5708c..0e8757468 100755 --- a/packaging/deb/common/prepare.sh +++ b/packaging/deb/common/prepare.sh @@ -14,9 +14,9 @@ BUILD_DEPENDENCIES=$($5) # Copy and unpack the archive with vpp-integration distribution ARCHIVE_DIR=${SOURCE_DIR}/../../../vpp-integration/minimal-distribution/target/ -ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-RC2-hc.tar.gz cp ${ARCHIVE} ${SOURCE_DIR} -ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz +ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-RC2-hc.tar.gz tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/ # Create packaging root @@ -24,7 +24,7 @@ rm -rf ${BUILD_DIR} mkdir ${BUILD_DIR} # Copy contents of tar.gz -mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${BUILD_DIR}/ +mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-RC2/ ${BUILD_DIR}/ cp -r $2 ${BUILD_DIR} # OS service definition @@ -41,7 +41,7 @@ EOT # Install instructions cat <> ${BUILD_DIR}/debian/install -vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/ +vpp-integration-distribution-${VERSION}-RC2/* /opt/honeycomb/ $3 $4 EOT diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index 3c4e7efde..ff01f4a07 100644 --- a/packaging/rpm/honeycomb.spec +++ b/packaging/rpm/honeycomb.spec @@ -17,7 +17,7 @@ Summary: fd.io Honeycomb Group: Applications/Communications License: Apache-1.0 URL: http://www.fd.io -Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip +Source0: vpp-integration-distribution-%{_version}-RC2-hc.zip Source1: honeycomb.service Requires: %{_vpp_dependencies}, java >= 1:1.8.0 # Required for creating honeycomb group @@ -38,13 +38,13 @@ fd.io Honeycomb %prep # Extract Source0 (Honeycomb archive) -%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT +%autosetup -n vpp-integration-distribution-%{_version}-RC2 %install # Create directory in build root for Honeycomb mkdir -p $RPM_BUILD_ROOT/opt/%name # Copy Honeycomb from archive to its dir in build root -cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-distribution-%{_version}-RC2/* $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 4de82e41c..6d685d2d4 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,10 +1,10 @@ #!/bin/bash # release version -# echo RELEASE +echo RC2 # # 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 26e314193..0b734d144 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.07-SNAPSHOT-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.07-RC2-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 bbf24cfab..ca4c67ab7 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 common/hc2vpp-parent io.fd.hc2vpp hc2vpp-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 hc2vpp pom 4.0.0 diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 63950ee6d..88dfc635f 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent io.fd.hc2vpp release-notes-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} pom 4.0.0 diff --git a/routing/pom.xml b/routing/pom.xml index 4c6839772..4a4ca1d5c 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent io.fd.hc2vpp.routing routing-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} pom 4.0.0 diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index 4abc2e6c0..f1a2d9acf 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent 4.0.0 io.fd.hc2vpp.routing routing-api - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 32572a85a..e25eafe8b 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.07-SNAPSHOT + 1.17.07-RC2 ../../vpp-common/vpp-impl-parent 4.0.0 io.fd.hc2vpp.routing routing-impl - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/samples/pom.xml b/samples/pom.xml index 0715343a0..a5345a459 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ hc2vpp-parent io.fd.hc2vpp.common - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent 4.0.0 diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index 3628915ac..8095c9d21 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent 4.0.0 @@ -13,7 +13,7 @@ io.fd.hc2vpp.common samples-api ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 7066bba82..bb669d627 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.07-SNAPSHOT + 1.17.07-RC2 ../../vpp-common/vpp-impl-parent 4.0.0 samples-impl ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 389a9d051..6261f4c96 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ io.fd.hc2vpp.common api-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent @@ -25,7 +25,7 @@ io.fd.hc2vpp.v3po v3po-api ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/v3po/pom.xml b/v3po/pom.xml index c56cdf590..73ba2136b 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent io.fd.hc2vpp.v3po v3po-aggregator - 1.17.07-SNAPSHOT + 1.17.07-RC2 ${project.artifactId} pom 4.0.0 diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index a36d7562e..bb8abe3f5 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ io.fd.hc2vpp.common vpp-impl-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../../vpp-common/vpp-impl-parent @@ -27,7 +27,7 @@ io.fd.hc2vpp.v3po v3po2vpp ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index b06949f91..f8fef374c 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.07-SNAPSHOT + 1.17.07-RC2 ../../common/api-parent 4.0.0 @@ -29,7 +29,7 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-api ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 bundle diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index 5b1ddc0f5..4f10ef097 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.07-SNAPSHOT + 1.17.07-RC2 ../../vpp-common/vpp-impl-parent @@ -30,14 +30,14 @@ io.fd.hc2vpp.vpp.classifier vpp-classifier-impl ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 io.fd.hc2vpp.vpp.classifier vpp-classifier-api - 1.17.07-SNAPSHOT + 1.17.07-RC2 diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index 1e64c19e3..0f22aacb2 100644 --- a/vpp-management/pom.xml +++ b/vpp-management/pom.xml @@ -21,7 +21,7 @@ io.fd.hc2vpp.common hc2vpp-parent - 1.17.07-SNAPSHOT + 1.17.07-RC2 ../common/hc2vpp-parent @@ -31,7 +31,7 @@ io.fd.hc2vpp.management vpp-management-aggregator ${project.artifactId} - 1.17.07-SNAPSHOT + 1.17.07-RC2 Aggregator for Hc2vpp vpp-management plugin -- cgit 1.2.3-korg