From 3b694eb79e50a30aec027c1d1bb6503f8df92da5 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
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 <mgradzki@cisco.com>
---
 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 -------
 4 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'vpp-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 @@
     <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>
@@ -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>
-- 
cgit 1.2.3-korg