From 3b694eb79e50a30aec027c1d1bb6503f8df92da5 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 9 Apr 2018 15:23:17 +0200 Subject: HC2VPP-283: cleanup honeycomb dependency versions Introduces honeycomb.version property in hc2vpp-parent and adds various honeycomb artifacts to impl-parent to reduce work when bumping honeycomb version. Change-Id: I2f31f255aa5234c6890073b93b11f93e5cd444f7 Signed-off-by: Marek Gradzki --- acl/acl-impl/pom.xml | 5 --- bgp/bgp-prefix-sid/pom.xml | 2 +- bgp/inet/pom.xml | 2 +- common/hc2vpp-parent/pom.xml | 4 +++ common/impl-parent/pom.xml | 51 ++++++++++++++++++++++++++-- common/minimal-distribution-parent/pom.xml | 6 ++-- dhcp/dhcp-impl/pom.xml | 3 -- interface-role/impl/pom.xml | 2 -- ioam/impl/pom.xml | 5 --- l3/utils/pom.xml | 1 - lisp/lisp2vpp/pom.xml | 4 --- mpls/impl/pom.xml | 3 -- nat/nat2vpp/pom.xml | 7 ---- nsh/impl/pom.xml | 4 --- routing/routing-impl/pom.xml | 4 --- samples/samples-impl/pom.xml | 4 --- v3po/v3po2vpp/pom.xml | 22 +++++------- vpp-classifier/impl/pom.xml | 2 -- vpp-common/naming-context-impl/pom.xml | 2 -- vpp-common/vpp-common-integration/pom.xml | 4 +-- vpp-common/vpp-translate-test/pom.xml | 2 -- vpp-common/vpp-translate-utils/pom.xml | 7 ---- vpp-integration/api-docs/core/pom.xml | 4 +-- vpp-integration/minimal-distribution/pom.xml | 3 +- vpp-management/impl/pom.xml | 3 -- 25 files changed, 70 insertions(+), 86 deletions(-) diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 74aac8380..ae42162c3 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -37,7 +37,6 @@ io.fd.honeycomb cfg-init - ${project.version} @@ -70,17 +69,14 @@ io.fd.honeycomb translate-spi - ${project.version} io.fd.honeycomb translate-impl - ${project.version} io.fd.honeycomb binding-init - ${project.version} @@ -120,7 +116,6 @@ io.fd.honeycomb.infra test-tools - ${project.version} test diff --git a/bgp/bgp-prefix-sid/pom.xml b/bgp/bgp-prefix-sid/pom.xml index 4649eb795..7300e0190 100644 --- a/bgp/bgp-prefix-sid/pom.xml +++ b/bgp/bgp-prefix-sid/pom.xml @@ -20,7 +20,7 @@ io.fd.honeycomb bgp-translate-api - ${project.version} + ${honeycomb.version} diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index 99124faa2..07650b655 100644 --- a/bgp/inet/pom.xml +++ b/bgp/inet/pom.xml @@ -20,7 +20,7 @@ io.fd.honeycomb bgp-translate-api - ${project.version} + ${honeycomb.version} diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index 7436bbe24..974adfc1e 100644 --- a/common/hc2vpp-parent/pom.xml +++ b/common/hc2vpp-parent/pom.xml @@ -16,4 +16,8 @@ ${project.artifactId} 1.18.04-SNAPSHOT pom + + + 1.18.04-SNAPSHOT + \ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index 0a66eeafd..11870d7e4 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -17,9 +17,9 @@ 1.18.04-SNAPSHOT pom - + io.fd.honeycomb.common impl-parent @@ -27,6 +27,53 @@ pom import + + + io.fd.honeycomb + binding-init + ${honeycomb.version} + + + io.fd.honeycomb + cfg-init + ${honeycomb.version} + + + io.fd.honeycomb + notification-api + ${honeycomb.version} + + + io.fd.honeycomb + rpc-api + ${honeycomb.version} + + + io.fd.honeycomb + translate-api + ${honeycomb.version} + + + io.fd.honeycomb + translate-spi + ${honeycomb.version} + + + io.fd.honeycomb + translate-impl + ${honeycomb.version} + + + io.fd.honeycomb + translate-utils + ${honeycomb.version} + + + io.fd.honeycomb.infra + test-tools + ${honeycomb.version} + test + @@ -78,7 +125,7 @@ io.fd.honeycomb.common common-scripts - ${project.version} + ${honeycomb.version} diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 86d0b053c..a16297dca 100644 --- a/common/minimal-distribution-parent/pom.xml +++ b/common/minimal-distribution-parent/pom.xml @@ -29,7 +29,7 @@ io.fd.honeycomb.common minimal-distribution-parent - 1.18.04-SNAPSHOT + ${honeycomb.version} pom import @@ -129,7 +129,7 @@ io.fd.honeycomb.common common-scripts - 1.18.04-SNAPSHOT + ${honeycomb.version} @@ -142,7 +142,7 @@ io.fd.honeycomb.common minimal-assembly-descriptor - 1.18.04-SNAPSHOT + ${honeycomb.version} diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 5919535b6..1eb334fc6 100644 --- a/dhcp/dhcp-impl/pom.xml +++ b/dhcp/dhcp-impl/pom.xml @@ -38,13 +38,11 @@ io.fd.honeycomb translate-api - ${project.version} io.fd.honeycomb translate-spi - ${project.version} @@ -103,7 +101,6 @@ io.fd.honeycomb.infra test-tools - ${project.version} test diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index 5561efea2..08ade3caf 100644 --- a/interface-role/impl/pom.xml +++ b/interface-role/impl/pom.xml @@ -45,7 +45,6 @@ io.fd.honeycomb translate-spi - ${project.version} com.google.inject.extensions @@ -54,7 +53,6 @@ io.fd.honeycomb translate-impl - ${project.version} \ No newline at end of file diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 9c06390ae..8fdb280fb 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -67,22 +67,18 @@ io.fd.honeycomb translate-impl - ${project.version} io.fd.honeycomb translate-api - ${project.version} io.fd.honeycomb notification-api - ${project.version} io.fd.honeycomb cfg-init - ${project.version} io.fd.vpp @@ -118,7 +114,6 @@ io.fd.honeycomb binding-init - ${project.version} junit diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index cff56921d..6dacb0a15 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -53,7 +53,6 @@ io.fd.honeycomb translate-utils - ${project.version} io.fd.hc2vpp.common diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 75fe65691..d4071f74e 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -40,7 +40,6 @@ ${project.honeycomb.groupId} translate-spi - ${project.version} ${project.vpp.groupId} @@ -55,12 +54,10 @@ ${project.honeycomb.groupId} translate-impl - ${project.version} ${project.honeycomb.groupId} cfg-init - ${project.version} io.fd.vpp @@ -118,7 +115,6 @@ io.fd.honeycomb.infra test-tools - ${project.version} test diff --git a/mpls/impl/pom.xml b/mpls/impl/pom.xml index 934b5f80f..f30169aee 100644 --- a/mpls/impl/pom.xml +++ b/mpls/impl/pom.xml @@ -35,17 +35,14 @@ io.fd.honeycomb translate-api - ${project.version} io.fd.honeycomb translate-impl - ${project.version} io.fd.honeycomb translate-spi - ${project.version} diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 9ff016c25..f96e96d9e 100644 --- a/nat/nat2vpp/pom.xml +++ b/nat/nat2vpp/pom.xml @@ -29,7 +29,6 @@ bundle - 1.18.04-SNAPSHOT 1.18.04-SNAPSHOT @@ -61,31 +60,26 @@ io.fd.honeycomb binding-init - ${honeycomb.infra.version} io.fd.honeycomb translate-api - ${honeycomb.infra.version} io.fd.honeycomb translate-spi - ${honeycomb.infra.version} io.fd.honeycomb translate-impl - ${honeycomb.infra.version} io.fd.honeycomb cfg-init - ${honeycomb.infra.version} @@ -131,7 +125,6 @@ io.fd.honeycomb.infra test-tools - ${project.version} test diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 31e00f866..9795c6118 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -69,17 +69,14 @@ io.fd.honeycomb translate-impl - ${project.version} io.fd.honeycomb translate-api - ${project.version} io.fd.honeycomb cfg-init - ${project.version} io.fd.vpp @@ -105,7 +102,6 @@ io.fd.honeycomb binding-init - ${project.version} junit diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 3ed85bdd3..5b95c4a81 100644 --- a/routing/routing-impl/pom.xml +++ b/routing/routing-impl/pom.xml @@ -41,19 +41,16 @@ io.fd.honeycomb translate-api - ${project.version} io.fd.honeycomb translate-spi - ${project.version} io.fd.honeycomb cfg-init - ${project.version} @@ -112,7 +109,6 @@ io.fd.honeycomb.infra test-tools - ${project.version} test diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 9121712c8..1c2e88848 100644 --- a/samples/samples-impl/pom.xml +++ b/samples/samples-impl/pom.xml @@ -25,7 +25,6 @@ io.fd.honeycomb translate-spi - ${project.version} @@ -36,7 +35,6 @@ io.fd.honeycomb translate-utils - ${project.version} @@ -48,13 +46,11 @@ io.fd.honeycomb translate-impl - ${project.version} io.fd.honeycomb cfg-init - ${project.version} diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index d78d16dd9..714cdb0ed 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -31,25 +31,29 @@ bundle + + io.fd.honeycomb + cfg-init + + + io.fd.honeycomb + translate-impl + io.fd.honeycomb translate-spi - ${project.version} io.fd.honeycomb notification-api - ${project.version} io.fd.honeycomb rpc-api - ${project.version} io.fd.honeycomb translate-utils - ${project.version} io.fd.hc2vpp.common @@ -62,16 +66,6 @@ ${project.version} - - io.fd.honeycomb - translate-impl - ${project.version} - - - io.fd.honeycomb - cfg-init - ${project.version} - io.fd.vpp jvpp-core diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index a619d3384..99953eddf 100644 --- a/vpp-classifier/impl/pom.xml +++ b/vpp-classifier/impl/pom.xml @@ -67,12 +67,10 @@ io.fd.honeycomb translate-spi - ${project.version} io.fd.honeycomb translate-utils - ${project.version} io.fd.hc2vpp.common diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml index 1bf2deb19..47dbfcb8f 100644 --- a/vpp-common/naming-context-impl/pom.xml +++ b/vpp-common/naming-context-impl/pom.xml @@ -34,12 +34,10 @@ io.fd.honeycomb translate-api - ${project.version} io.fd.honeycomb translate-utils - ${project.version} ${project.groupId} diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml index 9c638aaf7..944350f27 100644 --- a/vpp-common/vpp-common-integration/pom.xml +++ b/vpp-common/vpp-common-integration/pom.xml @@ -29,7 +29,6 @@ 1.18.04-SNAPSHOT - 1.18.04-SNAPSHOT 18.04-SNAPSHOT 1.3 @@ -61,12 +60,11 @@ io.fd.honeycomb minimal-distribution-core - ${honeycomb.min.distro.version} + ${honeycomb.version} io.fd.honeycomb cfg-init - ${project.version} ${project.groupId} diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml index d3cc5746b..1b59755f3 100644 --- a/vpp-common/vpp-translate-test/pom.xml +++ b/vpp-common/vpp-translate-test/pom.xml @@ -42,7 +42,6 @@ io.fd.honeycomb translate-spi - ${project.version} io.fd.vpp @@ -67,7 +66,6 @@ io.fd.honeycomb translate-utils - ${project.version} diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml index 42c798963..5c64a561d 100644 --- a/vpp-common/vpp-translate-utils/pom.xml +++ b/vpp-common/vpp-translate-utils/pom.xml @@ -38,7 +38,6 @@ io.fd.honeycomb translate-utils - ${project.version} ${project.groupId} @@ -61,11 +60,6 @@ org.opendaylight.mdsal.model ietf-interfaces - - io.fd.honeycomb - data-api - ${project.version} - commons-codec commons-codec @@ -96,7 +90,6 @@ io.fd.honeycomb.infra test-tools - ${project.version} test diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml index b90b6e5dd..b7b3bde06 100644 --- a/vpp-integration/api-docs/core/pom.xml +++ b/vpp-integration/api-docs/core/pom.xml @@ -84,12 +84,12 @@ io.fd.honeycomb translate-utils - ${project.version} + ${honeycomb.version} io.fd.honeycomb translate-api - ${project.version} + ${honeycomb.version} junit diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index e751577d3..8d043ca2a 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -33,7 +33,6 @@ io.fd.honeycomb.infra.distro.Main 1.18.04-SNAPSHOT 1.18.04-SNAPSHOT - 1.18.04-SNAPSHOT 1.18.04-SNAPSHOT 1.18.04-SNAPSHOT 1.18.04-SNAPSHOT @@ -103,7 +102,7 @@ io.fd.honeycomb minimal-distribution - ${hc.infra.version} + ${honeycomb.version} io.fd.hc2vpp.common diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index 358c01f0f..f848cd1f2 100644 --- a/vpp-management/impl/pom.xml +++ b/vpp-management/impl/pom.xml @@ -41,12 +41,10 @@ io.fd.honeycomb translate-api - ${project.version} io.fd.honeycomb rpc-api - ${project.version} @@ -71,7 +69,6 @@ io.fd.honeycomb translate-impl - ${project.version} -- cgit 1.2.3-korg