summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-07-01 00:39:26 +0200
committerMarek Gradzki <mgradzki@cisco.com>2017-07-01 01:17:25 +0200
commit9cfc1be756602e554860be23fd34835bfc897cc1 (patch)
treec24c4da976506481af80fafd681ad4c4111853c5
parent31f619b9e733bd3c88d77af1c0fc38258b8623de (diff)
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 <mgradzki@cisco.com>
-rw-r--r--acl/acl-impl/pom.xml2
-rw-r--r--ioam/impl/pom.xml2
-rw-r--r--nat/nat2vpp/pom.xml2
-rw-r--r--nsh/impl/pom.xml2
-rw-r--r--vpp-common/vpp-common-integration/pom.xml2
-rw-r--r--vpp-integration/minimal-distribution/pom.xml6
6 files changed, 11 insertions, 5 deletions
diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 758dceb9a..facc9707f 100644
--- 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 a3f7114ac..5a9d2466d 100644
--- 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 d3357ad87..7e2f6b9b3 100644
--- 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 7a0dd256e..1bc00d047 100644
--- 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 a2547df0b..7ba7d6359 100644
--- 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 621564602..a8616f535 100644
--- 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>
@@ -95,6 +96,11 @@
<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>
<version>${vpp.common.integration.version}</version>