summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nsh/impl/pom.xml8
-rw-r--r--pom.xml5
-rw-r--r--vpp-integration/api-docs/docs/pom.xml5
3 files changed, 3 insertions, 15 deletions
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