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>

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 74aac83..ae42162 100644 (file)
--- 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 4649eb7..7300e01 100644 (file)
--- 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 99124fa..07650b6 100644 (file)
--- 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 7436bbe..974adfc 100644 (file)
--- 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 0a66eea..11870d7 100644 (file)
--- 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 86d0b05..a16297d 100644 (file)
--- 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 5919535..1eb334f 100644 (file)
--- 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 5561efe..08ade3c 100644 (file)
--- 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 9c06390..8fdb280 100644 (file)
--- 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 cff5692..6dacb0a 100644 (file)
--- 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 75fe656..d4071f7 100755 (executable)
--- 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 934b5f8..f30169a 100644 (file)
--- 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 9ff016c..f96e96d 100644 (file)
--- 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 31e00f8..9795c61 100644 (file)
--- 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 3ed85bd..5b95c4a 100644 (file)
--- 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 9121712..1c2e888 100644 (file)
--- 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 d78d16d..714cdb0 100644 (file)
--- a/v3po/v3po2vpp/pom.xml
+++ b/v3po/v3po2vpp/pom.xml
@@ -31,25 +31,29 @@
     <packaging>bundle</packaging>
 
     <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>
@@ -62,16 +66,6 @@
             <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>cfg-init</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.fd.vpp</groupId>
             <artifactId>jvpp-core</artifactId>

diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml
index a619d33..99953ed 100644 (file)
--- 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 1bf2deb..47dbfcb 100644 (file)
--- 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 9c638aa..944350f 100644 (file)
--- 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 d3cc574..1b59755 100644 (file)
--- 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 42c7989..5c64a56 100644 (file)
--- 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>
@@ -61,11 +60,6 @@
             <groupId>org.opendaylight.mdsal.model</groupId>
             <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>
@@ -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 b90b6e5..b7b3bde 100644 (file)
--- 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 e751577..8d043ca 100644 (file)
--- 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 358c01f..f848cd1 100644 (file)
--- 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 -->