Change minimal-distribution to minimal-distribution-core

The minimal-distribution-core was introduced by HONEYCOMB-373.
Adoption is needed to remove indirect dependencies on various
HC infra yang models to decrease footprint
(HONEYCOMB-358 loads yang models based on maven dependencies).

Change-Id: Iba639efb893deb8d51de09009750542f78dfdd50
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 758dceb..facc970 100644 (file)
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -68,7 +68,7 @@
         </dependency>
         <dependency>
             <groupId>io.fd.honeycomb</groupId>
-            <artifactId>minimal-distribution</artifactId>
+            <artifactId>minimal-distribution-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 

diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index a3f7114..5a9d246 100644 (file)
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -117,7 +117,7 @@
     </dependency>
     <dependency>
       <groupId>io.fd.honeycomb</groupId>
-      <artifactId>minimal-distribution</artifactId>
+      <artifactId>minimal-distribution-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index d3357ad..7e2f6b9 100644 (file)
--- a/nat/nat2vpp/pom.xml
+++ b/nat/nat2vpp/pom.xml
@@ -60,7 +60,7 @@
         <!-- Honeycomb infrastructure-->
         <dependency>
             <groupId>io.fd.honeycomb</groupId>
-            <artifactId>minimal-distribution</artifactId>
+            <artifactId>minimal-distribution-core</artifactId>
             <version>${honeycomb.infra.version}</version>
         </dependency>
 

diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index 7a0dd25..1bc00d0 100644 (file)
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -108,7 +108,7 @@
     </dependency>
     <dependency>
       <groupId>io.fd.honeycomb</groupId>
-      <artifactId>minimal-distribution</artifactId>
+      <artifactId>minimal-distribution-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml
index a2547df..7ba7d63 100644 (file)
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -60,7 +60,7 @@
     <dependencies>
         <dependency>
             <groupId>io.fd.honeycomb</groupId>
-            <artifactId>minimal-distribution</artifactId>
+            <artifactId>minimal-distribution-core</artifactId>
             <version>${honeycomb.min.distro.version}</version>
         </dependency>
         <dependency>

diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 6215646..a8616f5 100644 (file)
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -33,6 +33,7 @@
     <main.class>io.fd.honeycomb.infra.distro.Main</main.class>
     <v3po.version>1.17.07-SNAPSHOT</v3po.version>
     <lisp.version>1.17.07-SNAPSHOT</lisp.version>
+    <hc.infra.version>1.17.07-SNAPSHOT</hc.infra.version>
     <vpp.common.integration.version>1.17.07-SNAPSHOT</vpp.common.integration.version>
     <vppnsh.version>1.17.07-SNAPSHOT</vppnsh.version>
     <nat.version>1.17.07-SNAPSHOT</nat.version>
@@ -94,6 +95,11 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>io.fd.honeycomb</groupId>
+      <artifactId>minimal-distribution</artifactId>
+      <version>${hc.infra.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.common</groupId>
       <artifactId>vpp-common-integration</artifactId>