From 01f765f7025d6e0d3fc04cd82d4a1d84ece86d8a Mon Sep 17 00:00:00 2001
From: Hongjun Ni <hongjun.ni@intel.com>
Date: Thu, 30 Mar 2017 20:21:35 +0800
Subject: Bump master's JVPP version to 17.07

Change-Id: Ie710f2a13429c2fd7625ec74f9e850d9b305a736
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
---
 nsh-plugin/configure.ac      |  2 +-
 nsh-plugin/java/Makefile.am  |  2 +-
 nsh-plugin/java/configure.ac |  2 +-
 nsh-plugin/java/jvpp/pom.xml | 16 ++++++++--------
 nsh-plugin/java/pom.xml      | 14 +++++++-------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/nsh-plugin/configure.ac b/nsh-plugin/configure.ac
index 52494fa..f33f520 100644
--- a/nsh-plugin/configure.ac
+++ b/nsh-plugin/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT(nsh_plugin, 17.04)
+AC_INIT(nsh_plugin, 17.07)
 AM_INIT_AUTOMAKE
 
 AC_PROG_LIBTOOL
diff --git a/nsh-plugin/java/Makefile.am b/nsh-plugin/java/Makefile.am
index 416a0e4..f85e163 100644
--- a/nsh-plugin/java/Makefile.am
+++ b/nsh-plugin/java/Makefile.am
@@ -35,7 +35,7 @@ lib_LTLIBRARIES = libjvpp_nsh.la
 
 libjvpp_nsh_la_SOURCES = $(srcdir)/../java/nsh.api.h jvpp/jvpp_nsh.c jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h
 
-libjvpp_nsh_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
+libjvpp_nsh_la_LIBADD = -lvlibmemoryclient -lsvm -lvppinfra \
 	              -lpthread -lm -lrt -ljvpp_common
 libjvpp_nsh_la_LDFLAGS = -module
 libjvpp_nsh_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I../ -I$(srcdir)/../
diff --git a/nsh-plugin/java/configure.ac b/nsh-plugin/java/configure.ac
index 552c21d..c541533 100644
--- a/nsh-plugin/java/configure.ac
+++ b/nsh-plugin/java/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(nsh-japi, 17.04)
+AC_INIT(nsh-japi, 17.07)
 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 515f251..bc39fe4 100644
--- a/nsh-plugin/java/jvpp/pom.xml
+++ b/nsh-plugin/java/jvpp/pom.xml
@@ -1,23 +1,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
- 
+
   <groupId>io.fd.nsh_sfc</groupId>
   <artifactId>nsh-sfc</artifactId>
-  <version>17.04-SNAPSHOT</version>
+  <version>17.07-SNAPSHOT</version>
   <packaging>jar</packaging>
- 
+
   <name>nsh-sfc</name>
   <url>https://wiki.fd.io/view/NSH_SFC</url>
-  
+
   <dependencies>
     <dependency>
       <groupId>io.fd.vpp</groupId>
       <artifactId>jvpp-registry</artifactId>
-      <version>17.04-SNAPSHOT</version>
+      <version>17.07-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>
@@ -29,7 +29,7 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -58,5 +58,5 @@
       </plugin>
     </plugins>
   </build>
-  
+
 </project>
diff --git a/nsh-plugin/java/pom.xml b/nsh-plugin/java/pom.xml
index 42926de..9074400 100644
--- a/nsh-plugin/java/pom.xml
+++ b/nsh-plugin/java/pom.xml
@@ -1,27 +1,27 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
- 
+
   <groupId>io.fd.nsh_sfc</groupId>
   <artifactId>nsh-sfc</artifactId>
-  <version>17.04-SNAPSHOT</version>
+  <version>17.07-SNAPSHOT</version>
   <packaging>jar</packaging>
- 
+
   <name>nsh-sfc</name>
   <url>https://wiki.fd.io/view/NSH_SFC</url>
 
   <properties>
     <nexusproxy>http://nexus.fd.io/content</nexusproxy>
   </properties>
-  
+
   <dependencies>
     <dependency>
       <groupId>io.fd.vpp</groupId>
       <artifactId>jvpp-registry</artifactId>
-      <version>17.04-SNAPSHOT</version>
+      <version>17.07-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>
@@ -33,7 +33,7 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-- 
cgit 1.2.3-korg