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>
---
 common/hc2vpp-parent/pom.xml               |  4 +++
 common/impl-parent/pom.xml                 | 51 ++++++++++++++++++++++++++++--
 common/minimal-distribution-parent/pom.xml |  6 ++--
 3 files changed, 56 insertions(+), 5 deletions(-)

(limited to 'common')

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>
-- 
cgit 1.2.3-korg