summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2018-04-09 15:23:17 +0200
committerMarek Gradzki <mgradzki@cisco.com>2018-04-09 13:58:00 +0000
commit3b694eb79e50a30aec027c1d1bb6503f8df92da5 (patch)
treedae8082eba9484e4bc35a81b7bf8be325885d4f1
parentfff535ff048d0ed3e492083d4936f61722362b4f (diff)
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 <mgradzki@cisco.com>
-rw-r--r--acl/acl-impl/pom.xml5
-rw-r--r--bgp/bgp-prefix-sid/pom.xml2
-rw-r--r--bgp/inet/pom.xml2
-rw-r--r--common/hc2vpp-parent/pom.xml4
-rw-r--r--common/impl-parent/pom.xml51
-rw-r--r--common/minimal-distribution-parent/pom.xml6
-rw-r--r--dhcp/dhcp-impl/pom.xml3
-rw-r--r--interface-role/impl/pom.xml2
-rw-r--r--ioam/impl/pom.xml5
-rw-r--r--l3/utils/pom.xml1
-rwxr-xr-xlisp/lisp2vpp/pom.xml4
-rw-r--r--mpls/impl/pom.xml3
-rw-r--r--nat/nat2vpp/pom.xml7
-rw-r--r--nsh/impl/pom.xml4
-rw-r--r--routing/routing-impl/pom.xml4
-rw-r--r--samples/samples-impl/pom.xml4
-rw-r--r--v3po/v3po2vpp/pom.xml22
-rw-r--r--vpp-classifier/impl/pom.xml2
-rw-r--r--vpp-common/naming-context-impl/pom.xml2
-rw-r--r--vpp-common/vpp-common-integration/pom.xml4
-rw-r--r--vpp-common/vpp-translate-test/pom.xml2
-rw-r--r--vpp-common/vpp-translate-utils/pom.xml7
-rw-r--r--vpp-integration/api-docs/core/pom.xml4
-rw-r--r--vpp-integration/minimal-distribution/pom.xml3
-rw-r--r--vpp-management/impl/pom.xml3
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>cfg-init</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -70,17 +69,14 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-impl</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>binding-init</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- HC2VPP Dependencies -->
@@ -120,7 +116,6 @@
<dependency>
<groupId>io.fd.honeycomb.infra</groupId>
<artifactId>test-tools</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>bgp-translate-api</artifactId>
- <version>${project.version}</version>
+ <version>${honeycomb.version}</version>
</dependency>
<!-- BGP api -->
<dependency>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>bgp-translate-api</artifactId>
- <version>${project.version}</version>
+ <version>${honeycomb.version}</version>
</dependency>
<!-- BGP api -->
<dependency>
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 @@
<name>${project.artifactId}</name>
<version>1.18.04-SNAPSHOT</version>
<packaging>pom</packaging>
+
+ <properties>
+ <honeycomb.version>1.18.04-SNAPSHOT</honeycomb.version>
+ </properties>
</project> \ 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 @@
<version>1.18.04-SNAPSHOT</version>
<packaging>pom</packaging>
- <!-- import dependencies from honeycomb impl-parent -->
<dependencyManagement>
<dependencies>
+ <!-- import dependencies from honeycomb impl-parent -->
<dependency>
<groupId>io.fd.honeycomb.common</groupId>
<artifactId>impl-parent</artifactId>
@@ -27,6 +27,53 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- honeycomb artifacts -->
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>binding-init</artifactId>
+ <version>${honeycomb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>cfg-init</artifactId>
+ <version>${honeycomb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>notification-api</artifactId>
+ <version>${honeycomb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>rpc-api</artifactId>
+ <version>${honeycomb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>translate-api</artifactId>
+ <version>${honeycomb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>translate-spi</artifactId>
+ <version>${honeycomb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>translate-impl</artifactId>
+ <version>${honeycomb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>translate-utils</artifactId>
+ <version>${honeycomb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb.infra</groupId>
+ <artifactId>test-tools</artifactId>
+ <version>${honeycomb.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -78,7 +125,7 @@
<dependency>
<groupId>io.fd.honeycomb.common</groupId>
<artifactId>common-scripts</artifactId>
- <version>${project.version}</version>
+ <version>${honeycomb.version}</version>
</dependency>
</dependencies>
</plugin>
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 @@
<dependency>
<groupId>io.fd.honeycomb.common</groupId>
<artifactId>minimal-distribution-parent</artifactId>
- <version>1.18.04-SNAPSHOT</version>
+ <version>${honeycomb.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -129,7 +129,7 @@
<dependency>
<groupId>io.fd.honeycomb.common</groupId>
<artifactId>common-scripts</artifactId>
- <version>1.18.04-SNAPSHOT</version>
+ <version>${honeycomb.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -142,7 +142,7 @@
<dependency>
<groupId>io.fd.honeycomb.common</groupId>
<artifactId>minimal-assembly-descriptor</artifactId>
- <version>1.18.04-SNAPSHOT</version>
+ <version>${honeycomb.version}</version>
</dependency>
</dependencies>
<executions>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Translation -->
@@ -103,7 +101,6 @@
<dependency>
<groupId>io.fd.honeycomb.infra</groupId>
<artifactId>test-tools</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
@@ -54,7 +53,6 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-impl</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
</project> \ 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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-impl</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>notification-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>cfg-init</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.vpp</groupId>
@@ -118,7 +114,6 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>binding-init</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-utils</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.hc2vpp.common</groupId>
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 @@
<dependency>
<groupId>${project.honeycomb.groupId}</groupId>
<artifactId>translate-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.vpp.groupId}</groupId>
@@ -55,12 +54,10 @@
<dependency>
<groupId>${project.honeycomb.groupId}</groupId>
<artifactId>translate-impl</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.honeycomb.groupId}</groupId>
<artifactId>cfg-init</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.vpp</groupId>
@@ -118,7 +115,6 @@
<dependency>
<groupId>io.fd.honeycomb.infra</groupId>
<artifactId>test-tools</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-impl</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- MPLS api -->
<dependency>
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 @@
<packaging>bundle</packaging>
<properties>
- <honeycomb.infra.version>1.18.04-SNAPSHOT</honeycomb.infra.version>
<hc2vpp.common.version>1.18.04-SNAPSHOT</hc2vpp.common.version>
</properties>
@@ -61,31 +60,26 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>binding-init</artifactId>
- <version>${honeycomb.infra.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-api</artifactId>
- <version>${honeycomb.infra.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-spi</artifactId>
- <version>${honeycomb.infra.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-impl</artifactId>
- <version>${honeycomb.infra.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>cfg-init</artifactId>
- <version>${honeycomb.infra.version}</version>
</dependency>
<!-- DI -->
@@ -131,7 +125,6 @@
<dependency>
<groupId>io.fd.honeycomb.infra</groupId>
<artifactId>test-tools</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-impl</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>cfg-init</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.vpp</groupId>
@@ -105,7 +102,6 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>binding-init</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>cfg-init</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Translation -->
@@ -112,7 +109,6 @@
<dependency>
<groupId>io.fd.honeycomb.infra</groupId>
<artifactId>test-tools</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Vpp api java wrapped -->
<dependency>
@@ -36,7 +35,6 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-utils</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Jvpp specific utils for translation code -->
<dependency>
@@ -48,13 +46,11 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-impl</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Initialization interfaces for infrastructure-->
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>cfg-init</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Google juice injection -->
<dependency>
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
@@ -33,23 +33,27 @@
<dependencies>
<dependency>
<groupId>io.fd.honeycomb</groupId>
+ <artifactId>cfg-init</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
+ <artifactId>translate-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.fd.honeycomb</groupId>
<artifactId>translate-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>notification-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>rpc-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-utils</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.hc2vpp.common</groupId>
@@ -63,16 +67,6 @@
</dependency>
<dependency>
- <groupId>io.fd.honeycomb</groupId>
- <artifactId>translate-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fd.honeycomb</groupId>
- <artifactId>cfg-init</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>io.fd.vpp</groupId>
<artifactId>jvpp-core</artifactId>
</dependency>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-utils</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.hc2vpp.common</groupId>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-utils</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</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 @@
<version>1.18.04-SNAPSHOT</version>
<properties>
- <honeycomb.min.distro.version>1.18.04-SNAPSHOT</honeycomb.min.distro.version>
<jvpp.version>18.04-SNAPSHOT</jvpp.version>
<hamcrest.version>1.3</hamcrest.version>
</properties>
@@ -61,12 +60,11 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>minimal-distribution-core</artifactId>
- <version>${honeycomb.min.distro.version}</version>
+ <version>${honeycomb.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>cfg-init</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-spi</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.vpp</groupId>
@@ -67,7 +66,6 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-utils</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
</project>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-utils</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -62,11 +61,6 @@
<artifactId>ietf-interfaces</artifactId>
</dependency>
<dependency>
- <groupId>io.fd.honeycomb</groupId>
- <artifactId>data-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
@@ -96,7 +90,6 @@
<dependency>
<groupId>io.fd.honeycomb.infra</groupId>
<artifactId>test-tools</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-utils</artifactId>
- <version>${project.version}</version>
+ <version>${honeycomb.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-api</artifactId>
- <version>${project.version}</version>
+ <version>${honeycomb.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
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 @@
<main.class>io.fd.honeycomb.infra.distro.Main</main.class>
<v3po.version>1.18.04-SNAPSHOT</v3po.version>
<lisp.version>1.18.04-SNAPSHOT</lisp.version>
- <hc.infra.version>1.18.04-SNAPSHOT</hc.infra.version>
<vpp.common.integration.version>1.18.04-SNAPSHOT</vpp.common.integration.version>
<vppnsh.version>1.18.04-SNAPSHOT</vppnsh.version>
<nat.version>1.18.04-SNAPSHOT</nat.version>
@@ -103,7 +102,7 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>minimal-distribution</artifactId>
- <version>${hc.infra.version}</version>
+ <version>${honeycomb.version}</version>
</dependency>
<dependency>
<groupId>io.fd.hc2vpp.common</groupId>
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 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>rpc-api</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- DI -->
@@ -71,7 +69,6 @@
<dependency>
<groupId>io.fd.honeycomb</groupId>
<artifactId>translate-impl</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- Test -->