diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2017-10-11 19:54:59 +0200 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2017-10-11 19:57:56 +0200 |
| commit | 36394d37e1e6585c063eeb57e0091cb46a46b1aa (patch) | |
| tree | 718b79a8e29751fba88a2c750dada4fd2133003d | |
| parent | 316854896ef1ec6bbebdd50f68b54ea1ef900b43 (diff) | |
Reenable nsh module
Also updates nsh-sfc jar to 18.01-SNAPSHOT
Change-Id: I25abe1f226e37f7460fedccaff7e50e2e97e97c1
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
| -rw-r--r-- | nsh/impl/pom.xml | 8 | ||||
| -rw-r--r-- | pom.xml | 5 | ||||
| -rw-r--r-- | vpp-integration/api-docs/docs/pom.xml | 5 |
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> @@ -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 |