From 043bd3f7e520623b423acdaa2970fd0518864070 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Thu, 6 Jul 2017 19:28:58 +0200
Subject: Bump jvpp version to 17.10-SNAPSHOT

Also sets version of vpp package dependencies to 17.10

Change-Id: I4e139ff2d485933c0de3339db50714a5c72e0a9e
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 acl/acl-impl/pom.xml                      |  2 +-
 ioam/impl/pom.xml                         |  4 ++--
 it/api-coverage/pom.xml                   |  2 +-
 jvpp-version                              |  2 +-
 nat/nat2vpp/pom.xml                       |  2 +-
 nsh/impl/pom.xml                          |  8 +++++++-
 packaging/deb/common/vpp_dependencies     |  4 ++--
 packaging/rpm/vpp_dependencies            |  4 ++--
 release-notes/pom.xml                     | 12 ++++++------
 vpp-common/vpp-common-integration/pom.xml |  2 +-
 vpp-common/vpp-impl-parent/pom.xml        |  2 +-
 11 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 4f9ba6deb..e7fad9e0a 100644
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -30,7 +30,7 @@
     <version>1.17.10-SNAPSHOT</version>
 
     <properties>
-        <jvpp.acl.version>17.07-SNAPSHOT</jvpp.acl.version>
+        <jvpp.acl.version>17.10-SNAPSHOT</jvpp.acl.version>
     </properties>
 
     <dependencies>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index f359e5bed..f7c122f18 100644
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -30,8 +30,8 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <ioam.version>17.07-SNAPSHOT</ioam.version>
-    <jvpp.version>17.07-SNAPSHOT</jvpp.version>
+    <ioam.version>17.10-SNAPSHOT</ioam.version>
+    <jvpp.version>17.10-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencies>
diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml
index 0ec8b52ec..f15642913 100644
--- a/it/api-coverage/pom.xml
+++ b/it/api-coverage/pom.xml
@@ -32,7 +32,7 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <jvpp.version>17.07-SNAPSHOT</jvpp.version>
+        <jvpp.version>17.10-SNAPSHOT</jvpp.version>
     </properties>
 
     <dependencies>
diff --git a/jvpp-version b/jvpp-version
index 5543a4092..077163df9 100755
--- a/jvpp-version
+++ b/jvpp-version
@@ -1,2 +1,2 @@
 #!/bin/sh
-echo 17.07-SNAPSHOT
+echo 17.10-SNAPSHOT
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index fe172ad8e..44ba78b61 100644
--- a/nat/nat2vpp/pom.xml
+++ b/nat/nat2vpp/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>io.fd.vpp</groupId>
             <artifactId>jvpp-snat</artifactId>
-            <version>17.07-SNAPSHOT</version>
+            <version>17.10-SNAPSHOT</version>
         </dependency>
 
         <!-- Honeycomb infrastructure-->
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index 66c74cfa3..bdbedb746 100644
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -89,12 +89,18 @@
     <dependency>
         <groupId>io.fd.vpp</groupId>
         <artifactId>jvpp-registry</artifactId>
-        <version>17.07-SNAPSHOT</version>
+        <version>17.10-SNAPSHOT</version>
     </dependency>
     <dependency>
         <groupId>io.fd.nsh_sfc</groupId>
         <artifactId>nsh-sfc</artifactId>
         <version>17.07-SNAPSHOT</version>
+        <exclusions>
+            <exclusion>
+                <groupId>io.fd.vpp</groupId>
+                <artifactId>jvpp-registry</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.common</groupId>
diff --git a/packaging/deb/common/vpp_dependencies b/packaging/deb/common/vpp_dependencies
index 5eaf6db6a..6f78a342a 100755
--- a/packaging/deb/common/vpp_dependencies
+++ b/packaging/deb/common/vpp_dependencies
@@ -1,6 +1,6 @@
 #!/bin/bash
 # defines vpp and vpp-plugins dependencies for debian packages
 # using range
-echo "vpp (>= 17.07), vpp (<< 17.08), vpp-plugins (>= 17.07), vpp-plugins (<< 17.08)"
+echo "vpp (>= 17.10), vpp (<< 17.11), vpp-plugins (>= 17.10), vpp-plugins (<< 17.11)"
 # or specific vpp version
-#echo "vpp (= 17.07-rc1), vpp-plugins (= 17.07-rc1)"
+#echo "vpp (= 17.10-rc1), vpp-plugins (= 17.10-rc1)"
diff --git a/packaging/rpm/vpp_dependencies b/packaging/rpm/vpp_dependencies
index b6cd6f96b..0ac35028a 100755
--- a/packaging/rpm/vpp_dependencies
+++ b/packaging/rpm/vpp_dependencies
@@ -1,6 +1,6 @@
 #!/bin/bash
 # defines vpp and vpp-plugins dependencies for rpm packages
 # using range
-echo "vpp >= 17.07, vpp < 17.08, vpp-plugins >= 17.07, vpp-plugins < 17.08"
+echo "vpp >= 17.10, vpp < 17.11, vpp-plugins >= 17.10, vpp-plugins < 17.11"
 # or specific vpp version
-#echo "vpp = 17.07-rc1, vpp-plugins = 17.07-rc1"
+#echo "vpp = 17.10-rc1, vpp-plugins = 17.10-rc1"
diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index dee63c631..1fc670f31 100644
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -79,14 +79,14 @@
                 <project-public-version>17.10</project-public-version>
                 <project-version-in-jira>10800</project-version-in-jira>
                 <project-branch>master</project-branch>
-                <project-vpp-version>17.07</project-vpp-version>
+                <project-vpp-version>17.10</project-vpp-version>
                 <!-- TODO set snapshot version to project-vpp-version after VPP is released-->
-                <!--<project-vpp-snapshot-version>17.07</project-vpp-snapshot-version>-->
-                <project-vpp-snapshot-version>17.07-SNAPSHOT</project-vpp-snapshot-version>
-                <project-snat-version>17.07</project-snat-version>
+                <!--<project-vpp-snapshot-version>17.10</project-vpp-snapshot-version>-->
+                <project-vpp-snapshot-version>17.10-SNAPSHOT</project-vpp-snapshot-version>
+                <project-snat-version>17.10</project-snat-version>
                 <!-- TODO set snapshot version to project-snat-version after VPP is released-->
-                <!--<project-snat-snapshot-version>17.07</project-snat-snapshot-version>-->
-                <project-snat-snapshot-version>17.07-SNAPSHOT</project-snat-snapshot-version>
+                <!--<project-snat-snapshot-version>17.10</project-snat-snapshot-version>-->
+                <project-snat-snapshot-version>17.10-SNAPSHOT</project-snat-snapshot-version>
                 <project-git-web>https://git.fd.io/cgit/hc2vpp/tree</project-git-web>
                 <project-infra-git-web>https://git.fd.io/cgit/honeycomb/tree</project-infra-git-web>
               </attributes>
diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml
index 979f0a8b9..11b1ae1f1 100644
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -30,7 +30,7 @@
 
     <properties>
         <honeycomb.min.distro.version>1.17.10-SNAPSHOT</honeycomb.min.distro.version>
-        <jvpp.version>17.07-SNAPSHOT</jvpp.version>
+        <jvpp.version>17.10-SNAPSHOT</jvpp.version>
         <hamcrest.version>1.3</hamcrest.version>
     </properties>
 
diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml
index 629927e0e..5962719fe 100644
--- a/vpp-common/vpp-impl-parent/pom.xml
+++ b/vpp-common/vpp-impl-parent/pom.xml
@@ -31,7 +31,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <jvpp.version>17.07-SNAPSHOT</jvpp.version>
+    <jvpp.version>17.10-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencyManagement>
-- 
cgit