From 1bcda138dc7bae6fd2bbd7fb7bb98af519c97e5c Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Thu, 26 Apr 2018 10:00:22 +0200
Subject: Set jvpp version to 18.04

NSH_SFC release artifacts are not available yet,
so 18.04-RC1 version was used.

Change-Id: I56e8810e4dd7dee3f15100103ee183bcfce41c12
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                          | 10 ++++++++--
 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, 20 insertions(+), 18 deletions(-)

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index ae42162c3..30c45f61c 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.04-SNAPSHOT</jvpp.acl.version>
+        <jvpp.acl.version>18.04</jvpp.acl.version>
     </properties>
 
     <dependencies>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index 8fdb280fb..20bcb008e 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.04</ioam.version>
+    <jvpp.version>18.04</jvpp.version>
   </properties>
 
   <dependencies>
diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml
index ce514c4ca..51a6e0d12 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.04</jvpp.version>
     </properties>
 
     <dependencies>
diff --git a/jvpp/version b/jvpp/version
index 9cd3db665..4f816d8ca 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.04
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index f96e96d9e..c95612c01 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.04</version>
         </dependency>
 
         <!-- Honeycomb infrastructure-->
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index 9795c6118..f10a2ba15 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.04</version>
     </dependency>
     <dependency>
         <groupId>io.fd.nsh_sfc</groupId>
         <artifactId>nsh-sfc</artifactId>
-        <version>18.04-SNAPSHOT</version>
+        <version>18.04-RC1</version>
+        <exclusions>
+            <exclusion>
+                <groupId>io.fd.nsh_sfc</groupId>
+                <artifactId>jvpp-registry</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.common</groupId>
diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index 9b4866c86..026a25208 100644
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -112,13 +112,9 @@
                 <project-branch>stable/1804</project-branch>
                 <project-odl-version>oxygen</project-odl-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.04</project-vpp-snapshot-version>-->
-                <project-vpp-snapshot-version>18.04-SNAPSHOT</project-vpp-snapshot-version>
+                <project-vpp-snapshot-version>18.04</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.04</project-nat-snapshot-version>-->
-                <project-nat-snapshot-version>18.04-SNAPSHOT</project-nat-snapshot-version>
+                <project-nat-snapshot-version>18.04</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 944350f27..f1e1a3d2a 100644
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -29,7 +29,7 @@
     <version>1.18.04-SNAPSHOT</version>
 
     <properties>
-        <jvpp.version>18.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>18.04</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 67aaefbd0..88832f7db 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.04</jvpp.version>
   </properties>
 
   <dependencyManagement>
diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml
index f4c4ac95a..24aa51821 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.04</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 b35bb4f7d..762559398 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.04</jvpp.version>
         <junit.version>4.11</junit.version>
         <reflections.version>0.9.11</reflections.version>
         <sonar.skip>true</sonar.skip>
-- 
cgit 1.2.3-korg