Bump jvpp version to 19.08-SNAPSHOT

Changes
 - sets version of VPP package dependencies to 19.04.
 - updates vpp-plugins to vpp-plugin-core dependencies for debian

Change-Id: I2bcd41e0cc6606406bdb7d5e7d7e30bc825eedce
Signed-off-by: Michal Cmarada <[email protected]>

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index a8275c1..0b31390 100644 (file)
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -30,7 +30,7 @@
     <version>1.19.08-SNAPSHOT</version>
 
     <properties>
-        <jvpp.acl.version>19.04-SNAPSHOT</jvpp.acl.version>
+        <jvpp.acl.version>19.08-SNAPSHOT</jvpp.acl.version>
     </properties>
 
     <dependencies>

diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index c61c4c3..0bd3ee6 100644 (file)
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -30,8 +30,8 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <ioam.version>19.04-SNAPSHOT</ioam.version>
-    <jvpp.version>19.04-SNAPSHOT</jvpp.version>
+    <ioam.version>19.08-SNAPSHOT</ioam.version>
+    <jvpp.version>19.08-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencies>

diff --git a/ipsec/ipsec-impl/pom.xml b/ipsec/ipsec-impl/pom.xml
index 81d6343..e843fb7 100644 (file)
--- a/ipsec/ipsec-impl/pom.xml
+++ b/ipsec/ipsec-impl/pom.xml
@@ -31,7 +31,7 @@
     <packaging>bundle</packaging>
 
     <properties>
-        <jvpp.version>19.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>19.08-SNAPSHOT</jvpp.version>
     </properties>
 
     <dependencies>

diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml
index 8b9cbf3..9802528 100644 (file)
--- a/it/api-coverage/pom.xml
+++ b/it/api-coverage/pom.xml
@@ -32,7 +32,7 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <jvpp.version>19.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>19.08-SNAPSHOT</jvpp.version>
     </properties>
 
     <dependencies>

diff --git a/it/jvpp-benchmark/pom.xml b/it/jvpp-benchmark/pom.xml
index f83f3b0..bf75e65 100644 (file)
--- a/it/jvpp-benchmark/pom.xml
+++ b/it/jvpp-benchmark/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <jmh.version>1.21</jmh.version>
-        <jvpp.version>19.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>19.08-SNAPSHOT</jvpp.version>
     </properties>
 
     <dependencies>

diff --git a/jvpp/common.sh b/jvpp/common.sh
index 8b8c4fe..85d86b5 100755 (executable)
--- 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-19.04
+  # Filename (includes version suffix), e.g. jvpp-core-19.08
   basefile=$(basename -s .jar "$jarfile")
 
   # Remove version suffix

diff --git a/jvpp/version b/jvpp/version
index 70889fc..317a4f8 100755 (executable)
--- a/jvpp/version
+++ b/jvpp/version
@@ -5,4 +5,4 @@
 #
 # Version should match the one used in pom files.
 #
-echo 19.04-SNAPSHOT
+echo 19.08-SNAPSHOT

diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index c916aee..9963025 100644 (file)
--- a/nat/nat2vpp/pom.xml
+++ b/nat/nat2vpp/pom.xml
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>io.fd.jvpp</groupId>
             <artifactId>jvpp-nat</artifactId>
-            <version>19.04-SNAPSHOT</version>
+            <version>19.08-SNAPSHOT</version>
         </dependency>
 
         <!-- Honeycomb infrastructure-->

diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index 2db2caa..533f508 100644 (file)
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -81,12 +81,12 @@
     <dependency>
         <groupId>io.fd.jvpp</groupId>
         <artifactId>jvpp-registry</artifactId>
-        <version>19.04-SNAPSHOT</version>
+        <version>19.08-SNAPSHOT</version>
     </dependency>
     <dependency>
         <groupId>io.fd.jvpp</groupId>
         <artifactId>jvpp-nsh</artifactId>
-        <version>19.04-SNAPSHOT</version>
+        <version>19.08-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 b27a68c..fdfbcfa 100755 (executable)
--- a/packaging/deb/common/vpp_dependencies
+++ b/packaging/deb/common/vpp_dependencies
@@ -1,6 +1,6 @@
 #!/bin/bash
 # defines vpp and vpp-plugin-core dependencies for debian packages
 # using range
-echo "vpp (>= 19.04), vpp (<< 19.05), vpp-plugin-core (>= 19.04), vpp-plugin-core (<< 19.05), vpp-api-java (>= 19.04), vpp-api-java (<< 19.05)"
+echo "vpp (>= 19.08), vpp (<< 19.09), vpp-plugin-core (>= 19.08), vpp-plugin-core (<< 19.09), vpp-api-java (>= 19.08), vpp-api-java (<< 19.09)"
 # or specific vpp version
-#echo "vpp (= 19.04-rc1), vpp-plugin-core (= 19.04-rc1)"
+#echo "vpp (= 19.08-rc1), vpp-plugin-core (= 19.08-rc1)"

diff --git a/packaging/rpm/vpp_dependencies b/packaging/rpm/vpp_dependencies
index 876a7f2..5ef2953 100755 (executable)
--- 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 >= 19.04, vpp < 19.05, vpp-plugins >= 19.04, vpp-plugins < 19.05, vpp-api-java (>= 19.04), vpp-api-java (<< 19.05)"
+echo "vpp >= 19.08, vpp < 19.09, vpp-plugins >= 19.08, vpp-plugins < 19.09, vpp-api-java (>= 19.08), vpp-api-java (<< 19.09)"
 # or specific vpp version
-#echo "vpp = 19.04-rc1, vpp-plugins = 19.04-rc1"
+#echo "vpp = 19.08-rc1, vpp-plugins = 19.08-rc1"

diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index deb5818..9616602 100644 (file)
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -111,14 +111,14 @@
                 <project-version-in-jira>11802</project-version-in-jira>
                 <project-branch>master</project-branch>
                 <project-odl-version>oxygen</project-odl-version>
-                <project-vpp-version>19.04</project-vpp-version>
+                <project-vpp-version>19.08</project-vpp-version>
                 <!-- TODO set snapshot version to project-vpp-version after VPP is released-->
-                <!--<project-vpp-snapshot-version>19.04</project-vpp-snapshot-version>-->
-                <project-vpp-snapshot-version>19.04-SNAPSHOT</project-vpp-snapshot-version>
-                <project-nat-version>19.04</project-nat-version>
+                <!--<project-vpp-snapshot-version>19.08</project-vpp-snapshot-version>-->
+                <project-vpp-snapshot-version>19.08-SNAPSHOT</project-vpp-snapshot-version>
+                <project-nat-version>19.08</project-nat-version>
                 <!-- TODO set snapshot version to project-nat-version after VPP is released-->
-                <!--<project-nat-snapshot-version>19.01</project-nat-snapshot-version>-->
-                <project-nat-snapshot-version>19.04-SNAPSHOT</project-nat-snapshot-version>
+                <!--<project-nat-snapshot-version>19.08</project-nat-snapshot-version>-->
+                <project-nat-snapshot-version>19.08-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 9865b6d..8e2c3ea 100644 (file)
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -30,7 +30,7 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <jvpp.version>19.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>19.08-SNAPSHOT</jvpp.version>
         <hamcrest.version>2.1</hamcrest.version>
     </properties>
 

diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml
index 5a55520..5ba80e2 100644 (file)
--- 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>19.04-SNAPSHOT</jvpp.version>
+    <jvpp.version>19.08-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencyManagement>

diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml
index be1c988..b26d561 100644 (file)
--- a/vpp-integration/api-docs/core/pom.xml
+++ b/vpp-integration/api-docs/core/pom.xml
@@ -37,7 +37,7 @@
         <asm.version>7.0</asm.version>
         <asciidoctorj.version>1.5.4</asciidoctorj.version>
         <slf4j-simple.version>1.7.25</slf4j-simple.version>
-        <jvpp.version>19.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>19.08-SNAPSHOT</jvpp.version>
         <guava.version>23.6-jre</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 708e0a7..547f9d4 100644 (file)
--- a/vpp-integration/api-docs/scripts/pom.xml
+++ b/vpp-integration/api-docs/scripts/pom.xml
@@ -30,7 +30,7 @@
         <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version>
         <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version>
 
-        <jvpp.version>19.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>19.08-SNAPSHOT</jvpp.version>
         <junit.version>4.11</junit.version>
         <reflections.version>0.9.11</reflections.version>
         <sonar.skip>true</sonar.skip>