From ada042f959ee24dc431fc59ffb1ae0e19f37ebb9 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Wed, 24 Jan 2018 08:30:50 +0100
Subject: Set jvpp version to 18.01

Change-Id: Ic240f174140a9739295d8ada2a3e22486ec656f8
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                          | 4 ++--
 release-notes/pom.xml                     | 8 ++------
 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 +-
 11 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 4a18f7a0d..1a5fe5b51 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>18.01-SNAPSHOT</jvpp.acl.version>
+        <jvpp.acl.version>18.01</jvpp.acl.version>
     </properties>
 
     <dependencies>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index faffd9fb7..56af501ff 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.01</ioam.version>
+    <jvpp.version>18.01</jvpp.version>
   </properties>
 
   <dependencies>
diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml
index 65f1e7ec0..9bafa1631 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.01</jvpp.version>
     </properties>
 
     <dependencies>
diff --git a/jvpp/version b/jvpp/version
index b2482d7e2..222eb62eb 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.01
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index 653695d28..f8ad0fe2d 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.01</version>
         </dependency>
 
         <!-- Honeycomb infrastructure-->
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index 91b222ee5..48affcb51 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.01</version>
     </dependency>
     <dependency>
         <groupId>io.fd.nsh_sfc</groupId>
         <artifactId>nsh-sfc</artifactId>
-        <version>18.01-SNAPSHOT</version>
+        <version>18.01</version>
     </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.common</groupId>
diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index 91ad40ba8..223cbddd8 100644
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -112,13 +112,9 @@
                 <project-branch>master</project-branch>
                 <project-odl-version>nitrogen</project-odl-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>18.01</project-vpp-snapshot-version>-->
-                <project-vpp-snapshot-version>18.01-SNAPSHOT</project-vpp-snapshot-version>
+                <project-vpp-snapshot-version>18.01</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>18.01</project-nat-snapshot-version>-->
-                <project-nat-snapshot-version>18.01-SNAPSHOT</project-nat-snapshot-version>
+                <project-nat-snapshot-version>18.01</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 e4f6b1f8d..ae577a09f 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>18.01-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.01</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 ed348ca01..228f59d09 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.01</jvpp.version>
   </properties>
 
   <dependencyManagement>
diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml
index 8aa4611ae..91a49b25f 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.01</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 3d73af7f0..8c5568466 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.01</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