From 84ee0566126ed99f7baa4429fa425f004c2f9a47 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Thu, 11 Jan 2018 08:28:31 +0100
Subject: Bump jvpp version to 18.04-SNAPSHOT

Also sets version of vpp package dependencies to 18.04.

Change-Id: I0b3faf6418ce9055ad05da41ba4fb022992f3784
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 +-
 jvpp/common.sh                            |  2 +-
 jvpp/version                              |  2 +-
 nat/nat2vpp/pom.xml                       |  2 +-
 nsh/impl/pom.xml                          |  4 ++--
 packaging/deb/common/vpp_dependencies     |  4 ++--
 packaging/rpm/release                     |  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 +-
 16 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 7fdd067dc..74aac8380 100644
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -30,7 +30,7 @@
     <version>1.18.04-SNAPSHOT</version>
 
     <properties>
-        <jvpp.acl.version>18.01-SNAPSHOT</jvpp.acl.version>
+        <jvpp.acl.version>18.04-SNAPSHOT</jvpp.acl.version>
     </properties>
 
     <dependencies>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index 59d495ba5..9c06390ae 100644
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -30,8 +30,8 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <ioam.version>18.01-SNAPSHOT</ioam.version>
-    <jvpp.version>18.01-SNAPSHOT</jvpp.version>
+    <ioam.version>18.04-SNAPSHOT</ioam.version>
+    <jvpp.version>18.04-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencies>
diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml
index 5fd4ff34c..ce514c4ca 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.01-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.04-SNAPSHOT</jvpp.version>
     </properties>
 
     <dependencies>
diff --git a/jvpp-version b/jvpp-version
index b2482d7e2..9cd3db665 100755
--- a/jvpp-version
+++ b/jvpp-version
@@ -5,4 +5,4 @@
 #
 # Version should match the one used in pom files.
 #
-echo 18.01-SNAPSHOT
+echo 18.04-SNAPSHOT
diff --git a/jvpp/common.sh b/jvpp/common.sh
index 456270635..cb5c658cf 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.01
+  # Filename (includes version suffix), e.g. jvpp-core-18.04
   basefile=$(basename -s .jar "$jarfile")
 
   # Remove version suffix
diff --git a/jvpp/version b/jvpp/version
index b2482d7e2..9cd3db665 100755
--- a/jvpp/version
+++ b/jvpp/version
@@ -5,4 +5,4 @@
 #
 # Version should match the one used in pom files.
 #
-echo 18.01-SNAPSHOT
+echo 18.04-SNAPSHOT
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index 5b6b5508f..9ff016c25 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>18.01-SNAPSHOT</version>
+            <version>18.04-SNAPSHOT</version>
         </dependency>
 
         <!-- Honeycomb infrastructure-->
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index cb40e3020..e95516f6e 100644
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -89,12 +89,12 @@
     <dependency>
         <groupId>io.fd.vpp</groupId>
         <artifactId>jvpp-registry</artifactId>
-        <version>18.01-SNAPSHOT</version>
+        <version>18.04-SNAPSHOT</version>
     </dependency>
     <dependency>
         <groupId>io.fd.nsh_sfc</groupId>
         <artifactId>nsh-sfc</artifactId>
-        <version>18.01-SNAPSHOT</version>
+        <version>18.04-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.common</groupId>
diff --git a/packaging/deb/common/vpp_dependencies b/packaging/deb/common/vpp_dependencies
index 41553fe30..7acc26423 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.01), vpp (<< 18.02), vpp-plugins (>= 18.01), vpp-plugins (<< 18.02)"
+echo "vpp (>= 18.04), vpp (<< 18.05), vpp-plugins (>= 18.04), vpp-plugins (<< 18.05)"
 # or specific vpp version
-#echo "vpp (= 18.01-rc1), vpp-plugins (= 18.01-rc1)"
+#echo "vpp (= 18.04-rc1), vpp-plugins (= 18.04-rc1)"
diff --git a/packaging/rpm/release b/packaging/rpm/release
index c8ed5e4f3..c95b6ae8a 100755
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -15,8 +15,8 @@ echo $(expr $BUILD_NUMBER + 2000)
 # echo RC2~$BUILD_NUMBER
 # echo RC2
 #
-# Release snapshot (1.18.01~XXX, 1.18.01.1~XXX, ...)
+# Release snapshot (1.18.04~XXX, 1.18.04.1~XXX, ...)
 # echo RELEASE~$BUILD_NUMBER
 #
-# Release version (1.18.01, 1.18.01.1, ...)
+# Release version (1.18.04, 1.18.04.1, ...)
 # echo RELEASE
\ No newline at end of file
diff --git a/packaging/rpm/vpp_dependencies b/packaging/rpm/vpp_dependencies
index f039bbf4d..7a1bcc57e 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.01, vpp < 18.02, vpp-plugins >= 18.01, vpp-plugins < 18.02"
+echo "vpp >= 18.04, vpp < 18.05, vpp-plugins >= 18.04, vpp-plugins < 18.05"
 # or specific vpp version
-#echo "vpp = 18.01-rc1, vpp-plugins = 18.01-rc1"
+#echo "vpp = 18.04-rc1, vpp-plugins = 18.04-rc1"
diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index 33dde779a..847d56fcf 100644
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -111,14 +111,14 @@
                 <project-version-in-jira>11102</project-version-in-jira>
                 <project-branch>master</project-branch>
                 <project-odl-version>nitrogen</project-odl-version>
-                <project-vpp-version>18.01</project-vpp-version>
+                <project-vpp-version>18.04</project-vpp-version>
                 <!-- TODO set snapshot version to project-vpp-version after VPP is released-->
-                <!--<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>
+                <!--<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>
                 <!-- TODO set snapshot version to project-nat-version after VPP is released-->
-                <!--<project-nat-snapshot-version>18.01</project-nat-snapshot-version>-->
-                <project-nat-snapshot-version>18.01-SNAPSHOT</project-nat-snapshot-version>
+                <!--<project-nat-snapshot-version>18.04</project-nat-snapshot-version>-->
+                <project-nat-snapshot-version>18.04-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 0ef088648..9c638aaf7 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.04-SNAPSHOT</honeycomb.min.distro.version>
-        <jvpp.version>18.01-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.04-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 1f61f114c..67aaefbd0 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.01-SNAPSHOT</jvpp.version>
+    <jvpp.version>18.04-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencyManagement>
diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml
index 5e4871d24..b90b6e5dd 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.01-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.04-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 1292cd73f..af19291c4 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.01-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.04-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