From: Marek Gradzki <mgradzki@cisco.com>
Date: Wed, 11 Oct 2017 17:54:59 +0000 (+0200)
Subject: Reenable nsh module
X-Git-Tag: v1.18.01-RC1~55
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=36394d37e1e6585c063eeb57e0091cb46a46b1aa;p=hc2vpp.git

Reenable nsh module

Also updates nsh-sfc jar to 18.01-SNAPSHOT

Change-Id: I25abe1f226e37f7460fedccaff7e50e2e97e97c1
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---

diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index f3dfe3694..91b222ee5 100644
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -94,13 +94,7 @@
     <dependency>
         <groupId>io.fd.nsh_sfc</groupId>
         <artifactId>nsh-sfc</artifactId>
-        <version>17.10-SNAPSHOT</version>
-        <exclusions>
-          <exclusion>
-            <groupId>io.fd.vpp</groupId>
-            <artifactId>jvpp-registry</artifactId>
-          </exclusion>
-        </exclusions>
+        <version>18.01-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.common</groupId>
diff --git a/pom.xml b/pom.xml
index 6bcadfe14..4958f4bca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,10 +39,7 @@
     <module>vpp-common</module>
     <module>v3po</module>
     <module>ioam</module>
-    <!--
-    nsh module breaks build by using outdated jvpp generator
     <module>nsh</module>
-    -->
     <module>routing</module>
     <module>nat</module>
     <module>lisp</module>
@@ -58,4 +55,4 @@
     <module>interface-role</module>
     <module>bgp</module>
   </modules>
-</project>
+</project>
\ No newline at end of file
diff --git a/vpp-integration/api-docs/docs/pom.xml b/vpp-integration/api-docs/docs/pom.xml
index d8021ff1c..5a6888b17 100644
--- a/vpp-integration/api-docs/docs/pom.xml
+++ b/vpp-integration/api-docs/docs/pom.xml
@@ -29,10 +29,7 @@
         <api.docs.modules>
             io.fd.hc2vpp.docs.core.mock.binding.MockBindingModule,
             io.fd.hc2vpp.docs.core.mock.binding.MockAclModule,
-            <!--
-            nsh module breaks build by using outdated jvpp generator
             io.fd.hc2vpp.docs.core.mock.binding.MockNshModule,
-            -->
             io.fd.hc2vpp.docs.core.mock.binding.MockIoamModule,
             io.fd.hc2vpp.docs.core.mock.binding.MockNatModule,
             io.fd.hc2vpp.iface.role.InterfaceRoleModule,
@@ -108,4 +105,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file