From: Matej <matej.perina@pantheon.tech>
Date: Wed, 11 Oct 2017 11:07:03 +0000 (+0200)
Subject: Temporarily disable nsh_sfc
X-Git-Tag: v1.18.01-RC1~56
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=316854896ef1ec6bbebdd50f68b54ea1ef900b43;p=hc2vpp.git

Temporarily disable nsh_sfc

nsh_sfc is using outdated jvpp-registry dependency which
breaks build for hc2vpp, until dependency is updated
nsh_sfc is going to be excluded from hc2vpp

Change-Id: Ib7ca2fda0c80257c7194336a55b071c70aebfe21
Signed-off-by: Matej <matej.perina@pantheon.tech>
---

diff --git a/pom.xml b/pom.xml
index 4958f4bca..6bcadfe14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,10 @@
     <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>
@@ -55,4 +58,4 @@
     <module>interface-role</module>
     <module>bgp</module>
   </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/vpp-integration/api-docs/docs/pom.xml b/vpp-integration/api-docs/docs/pom.xml
index 5a6888b17..d8021ff1c 100644
--- a/vpp-integration/api-docs/docs/pom.xml
+++ b/vpp-integration/api-docs/docs/pom.xml
@@ -29,7 +29,10 @@
         <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,
@@ -105,4 +108,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>