From b709841f3b01ace438185ea28c7aca19123291be Mon Sep 17 00:00:00 2001
From: Jan Srnicek <jsrnicek@cisco.com>
Date: Thu, 13 Oct 2016 13:56:47 +0200
Subject: HONEYCOMB-207 : Configurable modules list for distributions

Export list of modules for built distribution on compile time according
to distribution.modules property to ***module-config.txt
Load aggregated set of modules on start from all descriptors in /modules
folder

Change-Id: Icdeb23536aee3a243a221d3f2ec5f340d387764e
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
---
 vpp-integration/minimal-distribution/pom.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'vpp-integration/minimal-distribution/pom.xml')

diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 7e1aa0241..36d1e0f1a 100644
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -29,11 +29,19 @@
   <version>1.16.12-SNAPSHOT</version>
 
   <properties>
-    <main.class>io.fd.honeycomb.vpp.integration.distro.Main</main.class>
+    <main.class>io.fd.honeycomb.infra.distro.Main</main.class>
     <v3po.version>1.16.12-SNAPSHOT</v3po.version>
     <lisp.version>1.16.12-SNAPSHOT</lisp.version>
-    <vpp.common.min.distro.version>1.16.12-SNAPSHOT</vpp.common.min.distro.version>
+    <vpp.common.integration.version>1.16.12-SNAPSHOT</vpp.common.integration.version>
     <vppnsh.version>1.16.12-SNAPSHOT</vppnsh.version>
+
+    <distribution.modules>
+      io.fd.honeycomb.vpp.common.integration.VppCommonModule,
+      io.fd.honeycomb.lisp.LispModule,
+      io.fd.honeycomb.translate.v3po.V3poModule,
+      // io.fd.honeycomb.vppnsh.impl.VppNshModule
+      <!-- Nsh module by default disabled, because it needs vpp-nsh plugin, which is not part of vpp codebase.-->
+    </distribution.modules>
   </properties>
 
   <build>
@@ -62,8 +70,8 @@
   <dependencies>
     <dependency>
       <groupId>io.fd.honeycomb.vpp</groupId>
-      <artifactId>minimal-distribution</artifactId>
-      <version>${vpp.common.min.distro.version}</version>
+      <artifactId>vpp-common-integration</artifactId>
+      <version>${vpp.common.integration.version}</version>
     </dependency>
     <dependency>
       <groupId>io.fd.honeycomb.v3po</groupId>
-- 
cgit 1.2.3-korg