From 2c4fdea301293a4d034a78db0067394c44e2e931 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Wed, 4 Oct 2017 08:58:44 +0200
Subject: [PATCH] Bump jvpp version to 18.01-SNAPSHOT

Also sets version of vpp package dependencies to 18.01

Change-Id: I9d84915e206cc16c87479f94d4b8738899479cea
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 +-
 vpp-integration/api-docs/core/pom.xml     |  2 +-
 vpp-integration/api-docs/scripts/pom.xml  |  2 +-
 13 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index a34b594d8..4a18f7a0d 100644
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -30,7 +30,7 @@
     <version>1.18.01-SNAPSHOT</version>
 
     <properties>
-        <jvpp.acl.version>17.10-SNAPSHOT</jvpp.acl.version>
+        <jvpp.acl.version>18.01-SNAPSHOT</jvpp.acl.version>
     </properties>
 
     <dependencies>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index 61315e993..faffd9fb7 100644
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -30,8 +30,8 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <ioam.version>17.10-SNAPSHOT</ioam.version>
-    <jvpp.version>17.10-SNAPSHOT</jvpp.version>
+    <ioam.version>18.01-SNAPSHOT</ioam.version>
+    <jvpp.version>18.01-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencies>
diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml
index 5764da36d..65f1e7ec0 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.10-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.01-SNAPSHOT</jvpp.version>
     </properties>
 
     <dependencies>
diff --git a/jvpp-version b/jvpp-version
index 077163df9..9c95088d1 100755
--- a/jvpp-version
+++ b/jvpp-version
@@ -1,2 +1,2 @@
 #!/bin/sh
-echo 17.10-SNAPSHOT
+echo 18.01-SNAPSHOT
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index 7a030f5c4..653695d28 100644
--- a/nat/nat2vpp/pom.xml
+++ b/nat/nat2vpp/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>io.fd.vpp</groupId>
             <artifactId>jvpp-nat</artifactId>
-            <version>17.10-SNAPSHOT</version>
+            <version>18.01-SNAPSHOT</version>
         </dependency>
 
         <!-- Honeycomb infrastructure-->
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index e4a308fb5..f3dfe3694 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.10-SNAPSHOT</version>
+        <version>18.01-SNAPSHOT</version>
     </dependency>
     <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>
     </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.common</groupId>
diff --git a/packaging/deb/common/vpp_dependencies b/packaging/deb/common/vpp_dependencies
index 6f78a342a..41553fe30 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.10), vpp (<< 17.11), vpp-plugins (>= 17.10), vpp-plugins (<< 17.11)"
+echo "vpp (>= 18.01), vpp (<< 18.02), vpp-plugins (>= 18.01), vpp-plugins (<< 18.02)"
 # or specific vpp version
-#echo "vpp (= 17.10-rc1), vpp-plugins (= 17.10-rc1)"
+#echo "vpp (= 18.01-rc1), vpp-plugins (= 18.01-rc1)"
diff --git a/packaging/rpm/vpp_dependencies b/packaging/rpm/vpp_dependencies
index 0ac35028a..f039bbf4d 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.10, vpp < 17.11, vpp-plugins >= 17.10, vpp-plugins < 17.11"
+echo "vpp >= 18.01, vpp < 18.02, vpp-plugins >= 18.01, vpp-plugins < 18.02"
 # or specific vpp version
-#echo "vpp = 17.10-rc1, vpp-plugins = 17.10-rc1"
+#echo "vpp = 18.01-rc1, vpp-plugins = 18.01-rc1"
diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index a4ba16e60..c7db98ae4 100644
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -109,14 +109,14 @@
                 <project-public-version>18.01</project-public-version>
                 <project-version-in-jira>11002</project-version-in-jira>
                 <project-branch>master</project-branch>
-                <project-vpp-version>17.10</project-vpp-version>
+                <project-vpp-version>18.01</project-vpp-version>
                 <!-- TODO set snapshot version to project-vpp-version after VPP is released-->
-                <!--<project-vpp-snapshot-version>17.10</project-vpp-snapshot-version>-->
-                <project-vpp-snapshot-version>17.10-SNAPSHOT</project-vpp-snapshot-version>
-                <project-nat-version>17.10</project-nat-version>
+                <!--<project-vpp-snapshot-version>18.01</project-vpp-snapshot-version>-->
+                <project-vpp-snapshot-version>18.01-SNAPSHOT</project-vpp-snapshot-version>
+                <project-nat-version>18.01</project-nat-version>
                 <!-- TODO set snapshot version to project-nat-version after VPP is released-->
-                <!--<project-nat-snapshot-version>17.10</project-nat-snapshot-version>-->
-                <project-nat-snapshot-version>17.10-SNAPSHOT</project-nat-snapshot-version>
+                <!--<project-nat-snapshot-version>18.01</project-nat-snapshot-version>-->
+                <project-nat-snapshot-version>18.01-SNAPSHOT</project-nat-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 46cd0aa08..e4f6b1f8d 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.18.01-SNAPSHOT</honeycomb.min.distro.version>
-        <jvpp.version>17.10-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.01-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 b4e9774f1..ed348ca01 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.10-SNAPSHOT</jvpp.version>
+    <jvpp.version>18.01-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencyManagement>
diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml
index 54afc8708..8aa4611ae 100644
--- a/vpp-integration/api-docs/core/pom.xml
+++ b/vpp-integration/api-docs/core/pom.xml
@@ -37,7 +37,7 @@
         <asm.version>5.2</asm.version>
         <asciidoctorj.version>1.5.4</asciidoctorj.version>
         <slf4j-simple.version>1.7.25</slf4j-simple.version>
-        <jvpp.version>17.10-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.01-SNAPSHOT</jvpp.version>
         <guava.version>19.0</guava.version>
         <reflections.version>0.9.11</reflections.version>
 
diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml
index 12efc08ea..3d73af7f0 100644
--- a/vpp-integration/api-docs/scripts/pom.xml
+++ b/vpp-integration/api-docs/scripts/pom.xml
@@ -29,7 +29,7 @@
         <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
         <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
 
-        <jvpp.version>17.10-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.01-SNAPSHOT</jvpp.version>
         <junit.version>4.12</junit.version>
         <reflections.version>0.9.11</reflections.version>
         <sonar.skip>true</sonar.skip>
-- 
2.16.6