Bump master's JVPP version to 18.01

Change-Id: I4005caa45ba04862eaefdc108f8613c157925f73
Signed-off-by: Hongjun Ni <[email protected]>

diff --git a/nsh-plugin/configure.ac b/nsh-plugin/configure.ac
index a43a51d..7cb23d5 100644 (file)
--- a/nsh-plugin/configure.ac
+++ b/nsh-plugin/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT(nsh_plugin, 17.10)
+AC_INIT(nsh_plugin, 18.01)
 AM_INIT_AUTOMAKE
 
 AC_PROG_LIBTOOL

diff --git a/nsh-plugin/java/configure.ac b/nsh-plugin/java/configure.ac
index 475fee4..c43ff90 100644 (file)
--- a/nsh-plugin/java/configure.ac
+++ b/nsh-plugin/java/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(nsh-japi, 17.10)
+AC_INIT(nsh-japi, 18.01)
 LT_INIT
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE

diff --git a/nsh-plugin/java/jvpp/pom.xml b/nsh-plugin/java/jvpp/pom.xml
index 1165a95..debe833 100644 (file)
--- a/nsh-plugin/java/jvpp/pom.xml
+++ b/nsh-plugin/java/jvpp/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>io.fd.nsh_sfc</groupId>
   <artifactId>nsh-sfc</artifactId>
-  <version>17.10-SNAPSHOT</version>
+  <version>18.01-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>nsh-sfc</name>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.fd.vpp</groupId>
       <artifactId>jvpp-registry</artifactId>
-      <version>17.10-SNAPSHOT</version>
+      <version>18.01-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/nsh-plugin/java/jvpp/test/JVppNshTest.java b/nsh-plugin/java/jvpp/test/JVppNshTest.java
index 9cda316..a7d38ad 100644 (file)
--- a/nsh-plugin/java/jvpp/test/JVppNshTest.java
+++ b/nsh-plugin/java/jvpp/test/JVppNshTest.java
@@ -33,7 +33,7 @@ import io.fd.vpp.jvpp.nsh.*;
  */
 public class JVppNshTest {
 
-    static class TestCallback implements NshAddDelEntryCallback, NshEntryCallback {
+    static class TestCallback implements NshAddDelEntryReplyCallback, NshEntryDetailsCallback {
 
         @Override
         public void onNshAddDelEntryReply(final NshAddDelEntryReply msg) {

diff --git a/nsh-plugin/java/pom.xml b/nsh-plugin/java/pom.xml
index db6cd8d..94466af 100644 (file)
--- a/nsh-plugin/java/pom.xml
+++ b/nsh-plugin/java/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>io.fd.nsh_sfc</groupId>
   <artifactId>nsh-sfc</artifactId>
-  <version>17.10-SNAPSHOT</version>
+  <version>18.01-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>nsh-sfc</name>
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>io.fd.vpp</groupId>
       <artifactId>jvpp-registry</artifactId>
-      <version>17.10-SNAPSHOT</version>
+      <version>18.01-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/nsh-plugin/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export.c b/nsh-plugin/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export.c
index 4860846..bac7567 100644 (file)
--- a/nsh-plugin/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export.c
+++ b/nsh-plugin/nsh-md2-ioam/export-nsh-md2-ioam/nsh_md2_ioam_export.c
@@ -24,7 +24,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 #include <nsh/nsh.h>
 #include <nsh-md2-ioam/nsh_md2_ioam.h>

diff --git a/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam.c b/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam.c
index 23278b9..c237a8c 100644 (file)
--- a/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam.c
+++ b/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam.c
@@ -24,7 +24,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 #include <vnet/fib/ip6_fib.h>
 #include <vnet/fib/ip4_fib.h>

diff --git a/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam_api.c b/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam_api.c
index 42172cb..9f74da2 100644 (file)
--- a/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam_api.c
+++ b/nsh-plugin/nsh-md2-ioam/nsh_md2_ioam_api.c
@@ -26,7 +26,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 /* define message IDs */
 #include <vpp-api/nsh_msg_enum.h>

diff --git a/nsh-plugin/nsh/nsh.c b/nsh-plugin/nsh/nsh.c
index 0bbccc0..c179c3d 100644 (file)
--- a/nsh-plugin/nsh/nsh.c
+++ b/nsh-plugin/nsh/nsh.c
@@ -26,7 +26,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 /* define message IDs */
 #include <vpp-api/nsh_msg_enum.h>

diff --git a/nsh-plugin/nsh/nsh_pop.c b/nsh-plugin/nsh/nsh_pop.c
index ed3d84a..cd25bb9 100644 (file)
--- a/nsh-plugin/nsh/nsh_pop.c
+++ b/nsh-plugin/nsh/nsh_pop.c
@@ -25,7 +25,6 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 extern nsh_option_map_t * nsh_md2_lookup_option (u16 class, u8 type);
 

diff --git a/nsh-plugin/nsh/nsh_test.c b/nsh-plugin/nsh/nsh_test.c
index 6171b58..f2612d7 100644 (file)
--- a/nsh-plugin/nsh/nsh_test.c
+++ b/nsh-plugin/nsh/nsh_test.c
@@ -17,7 +17,6 @@
 #include <vat/vat.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 #include <vppinfra/error.h>
 #include <nsh/nsh.h>