From 147b1269a2588208defa7bff171c4a685f6ade8a Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Mon, 9 Apr 2018 17:47:12 +0200
Subject: Bump jvpp version to 18.07-SNAPSHOT

Also sets version of VPP package dependencies to 18.07.

Change-Id: I87d5f538891d946b3a803afa987ab39c609f1ae1
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/common.sh                            |  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 +-
 14 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 62e9ecdef..6491d661c 100644
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -30,7 +30,7 @@
     <version>1.18.07-SNAPSHOT</version>
 
     <properties>
-        <jvpp.acl.version>18.04-SNAPSHOT</jvpp.acl.version>
+        <jvpp.acl.version>18.07-SNAPSHOT</jvpp.acl.version>
     </properties>
 
     <dependencies>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index 22254f4e0..50e4cf9cc 100644
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -30,8 +30,8 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <ioam.version>18.04-SNAPSHOT</ioam.version>
-    <jvpp.version>18.04-SNAPSHOT</jvpp.version>
+    <ioam.version>18.07-SNAPSHOT</ioam.version>
+    <jvpp.version>18.07-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencies>
diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml
index b83b175ef..b6b9a8a6f 100644
--- a/it/api-coverage/pom.xml
+++ b/it/api-coverage/pom.xml
@@ -32,7 +32,7 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <jvpp.version>18.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.07-SNAPSHOT</jvpp.version>
     </properties>
 
     <dependencies>
diff --git a/jvpp/common.sh b/jvpp/common.sh
index cb5c658cf..99c4397f9 100755
--- a/jvpp/common.sh
+++ b/jvpp/common.sh
@@ -9,7 +9,7 @@ function install_jvpp_jar {
   jarfile=$1
   version=$2
 
-  # Filename (includes version suffix), e.g. jvpp-core-18.04
+  # Filename (includes version suffix), e.g. jvpp-core-18.07
   basefile=$(basename -s .jar "$jarfile")
 
   # Remove version suffix
diff --git a/jvpp/version b/jvpp/version
index 9cd3db665..55bec26b9 100755
--- a/jvpp/version
+++ b/jvpp/version
@@ -5,4 +5,4 @@
 #
 # Version should match the one used in pom files.
 #
-echo 18.04-SNAPSHOT
+echo 18.07-SNAPSHOT
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index 2f84e62cf..b2692241a 100644
--- a/nat/nat2vpp/pom.xml
+++ b/nat/nat2vpp/pom.xml
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>io.fd.vpp</groupId>
             <artifactId>jvpp-nat</artifactId>
-            <version>18.04-SNAPSHOT</version>
+            <version>18.07-SNAPSHOT</version>
         </dependency>
 
         <!-- Honeycomb infrastructure-->
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index 8ebb8d776..0b8cd1fc2 100644
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -81,12 +81,18 @@
     <dependency>
         <groupId>io.fd.vpp</groupId>
         <artifactId>jvpp-registry</artifactId>
-        <version>18.04-SNAPSHOT</version>
+        <version>18.07-SNAPSHOT</version>
     </dependency>
     <dependency>
         <groupId>io.fd.nsh_sfc</groupId>
         <artifactId>nsh-sfc</artifactId>
         <version>18.04-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 7acc26423..c69358ee3 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 (>= 18.04), vpp (<< 18.05), vpp-plugins (>= 18.04), vpp-plugins (<< 18.05)"
+echo "vpp (>= 18.07), vpp (<< 18.08), vpp-plugins (>= 18.07), vpp-plugins (<< 18.08)"
 # or specific vpp version
-#echo "vpp (= 18.04-rc1), vpp-plugins (= 18.04-rc1)"
+#echo "vpp (= 18.07-rc1), vpp-plugins (= 18.07-rc1)"
diff --git a/packaging/rpm/vpp_dependencies b/packaging/rpm/vpp_dependencies
index 7a1bcc57e..e0a0ededf 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 >= 18.04, vpp < 18.05, vpp-plugins >= 18.04, vpp-plugins < 18.05"
+echo "vpp >= 18.07, vpp < 18.08, vpp-plugins >= 18.07, vpp-plugins < 18.08"
 # or specific vpp version
-#echo "vpp = 18.04-rc1, vpp-plugins = 18.04-rc1"
+#echo "vpp = 18.07-rc1, vpp-plugins = 18.07-rc1"
diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index 260272f3c..fe836e72f 100644
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -111,14 +111,14 @@
                 <project-version-in-jira>11301</project-version-in-jira>
                 <project-branch>master</project-branch>
                 <project-odl-version>oxygen</project-odl-version>
-                <project-vpp-version>18.04</project-vpp-version>
+                <project-vpp-version>18.07</project-vpp-version>
                 <!-- TODO set snapshot version to project-vpp-version after VPP is released-->
-                <!--<project-vpp-snapshot-version>18.04</project-vpp-snapshot-version>-->
-                <project-vpp-snapshot-version>18.04-SNAPSHOT</project-vpp-snapshot-version>
-                <project-nat-version>18.04</project-nat-version>
+                <!--<project-vpp-snapshot-version>18.07</project-vpp-snapshot-version>-->
+                <project-vpp-snapshot-version>18.07-SNAPSHOT</project-vpp-snapshot-version>
+                <project-nat-version>18.07</project-nat-version>
                 <!-- TODO set snapshot version to project-nat-version after VPP is released-->
-                <!--<project-nat-snapshot-version>18.04</project-nat-snapshot-version>-->
-                <project-nat-snapshot-version>18.04-SNAPSHOT</project-nat-snapshot-version>
+                <!--<project-nat-snapshot-version>18.07</project-nat-snapshot-version>-->
+                <project-nat-snapshot-version>18.07-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 6971d2062..488a27836 100644
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -29,7 +29,7 @@
     <version>1.18.07-SNAPSHOT</version>
 
     <properties>
-        <jvpp.version>18.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.07-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 8957fd6d6..88cbe8898 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>18.04-SNAPSHOT</jvpp.version>
+    <jvpp.version>18.07-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencyManagement>
diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml
index b0709d24d..e0a21a6c9 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>18.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.07-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 0648a74e1..dbcc86dbe 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>18.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.07-SNAPSHOT</jvpp.version>
         <junit.version>4.12</junit.version>
         <reflections.version>0.9.11</reflections.version>
         <sonar.skip>true</sonar.skip>
-- 
cgit 1.2.3-korg