From 7d6c038cb30b933582d15fb6ab92fed60ce8092f Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Fri, 1 Jun 2018 12:48:27 +0200
Subject: HC2VPP-336: reenable NSH plugin

This patch reverts https://gerrit.fd.io/r/#/c/12822/
and bumps jvpp nsh_sfc dependency to 18.07-SNAPSHOT.

Change-Id: Idce70d39c9c273b7db3c771430ef5af58417b43b
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 vpp-integration/minimal-distribution/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'vpp-integration/minimal-distribution')

diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 791ad9515..8399ff27e 100644
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -65,6 +65,8 @@
       io.fd.hc2vpp.dhcp.DhcpModule,
       io.fd.hc2vpp.policer.PolicerModule,
       io.fd.hc2vpp.mpls.MplsModule,
+      <!-- Nsh module by default disabled, because it needs vpp-nsh plugin, which is not part of vpp codebase.-->
+      // io.fd.hc2vpp.vppnsh.impl.VppNshModule,
       <!-- iOAM module by default disabled, because it needs ioam plugin (not part of vpp codebase.)-->
       // io.fd.hc2vpp.vppioam.impl.VppIoamModule,
       <!-- Bgp modules disabled by default, because it BGP northbound interface is not enabled by default -->
@@ -127,6 +129,11 @@
       <artifactId>lisp2vpp</artifactId>
       <version>${lisp.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.fd.hc2vpp.nsh</groupId>
+      <artifactId>vppnsh-impl</artifactId>
+      <version>${vppnsh.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.nat</groupId>
       <artifactId>nat2vpp</artifactId>
-- 
cgit 1.2.3-korg