From d0fe32e6acaab61b9d21406eaaa8b92db2b86b9e Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Tue, 6 Jun 2017 18:24:29 +0200
Subject: Set vpp and nsh-sfc dependencies to most recent versions

17.04-SNAPSHOTs are removed on daily basis from nexus
repository after release version is published.

The nsh-sfc version was set to 17.04.
The jvpp atifacts version was set to 17.04.2-SNAPSHOT,

Change-Id: I3df27b5a7e26b2e68f00d2da800f22023ce22f13
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 acl/acl-impl/pom.xml                      |  2 +-
 ioam/impl/pom.xml                         |  4 ++--
 jvpp-version                              |  2 +-
 nat/nat2vpp/pom.xml                       |  2 +-
 nsh/impl/pom.xml                          | 18 ++++++++++++------
 release-notes/pom.xml                     |  8 ++++----
 vpp-common/vpp-common-integration/pom.xml |  2 +-
 vpp-common/vpp-impl-parent/pom.xml        |  2 +-
 8 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index f02de302e..09a95c84c 100644
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -30,7 +30,7 @@
     <version>1.17.04.1-SNAPSHOT</version>
 
     <properties>
-        <jvpp.acl.version>17.04-SNAPSHOT</jvpp.acl.version>
+        <jvpp.acl.version>17.04.2-SNAPSHOT</jvpp.acl.version>
     </properties>
 
     <dependencies>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index 26ff85e64..7a982074b 100644
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -30,8 +30,8 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <ioam.version>17.04-SNAPSHOT</ioam.version>
-    <jvpp.version>17.04-SNAPSHOT</jvpp.version>
+    <ioam.version>17.04.2-SNAPSHOT</ioam.version>
+    <jvpp.version>17.04.2-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencies>
diff --git a/jvpp-version b/jvpp-version
index 416238ec3..9096a312f 100755
--- a/jvpp-version
+++ b/jvpp-version
@@ -1,2 +1,2 @@
 #!/bin/sh
-echo 17.04-SNAPSHOT
+echo 17.04.2-SNAPSHOT
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index d827c3c74..baf71ed2f 100644
--- a/nat/nat2vpp/pom.xml
+++ b/nat/nat2vpp/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>io.fd.vpp</groupId>
             <artifactId>jvpp-snat</artifactId>
-            <version>17.04-SNAPSHOT</version>
+            <version>17.04.2-SNAPSHOT</version>
         </dependency>
 
         <!-- Honeycomb infrastructure-->
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index 7d755c10e..6bf47ee2a 100644
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -89,12 +89,18 @@
     <dependency>
         <groupId>io.fd.vpp</groupId>
         <artifactId>jvpp-registry</artifactId>
-        <version>17.04-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-        <groupId>io.fd.nsh_sfc</groupId>
-        <artifactId>nsh-sfc</artifactId>
-        <version>17.04-SNAPSHOT</version>
+        <version>17.04.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>io.fd.nsh_sfc</groupId>
+      <artifactId>nsh-sfc</artifactId>
+      <version>17.04</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/release-notes/pom.xml b/release-notes/pom.xml
index 8e8f9d530..5181147b4 100644
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -79,10 +79,10 @@
                 <project-public-version>17.04</project-public-version>
                 <project-version-in-jira>10601</project-version-in-jira>
                 <project-branch>stable/1704</project-branch>
-                <project-vpp-version>17.04</project-vpp-version>
-                <project-vpp-snapshot-version>17.04</project-vpp-snapshot-version>
-                <project-snat-version>17.04</project-snat-version>
-                <project-snat-snapshot-version>17.04</project-snat-snapshot-version>
+                <project-vpp-version>17.04.2</project-vpp-version>
+                <project-vpp-snapshot-version>17.04.2-SNAPSHOT</project-vpp-snapshot-version>
+                <project-snat-version>17.04.2</project-snat-version>
+                <project-snat-snapshot-version>17.04.2-SNAPSHOT</project-snat-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 67fbdb36b..031f907ea 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.17.04.1-SNAPSHOT</honeycomb.min.distro.version>
-        <jvpp.version>17.04-SNAPSHOT</jvpp.version>
+        <jvpp.version>17.04.2-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 dd219ac68..f19962cd7 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>17.04-SNAPSHOT</jvpp.version>
+    <jvpp.version>17.04.2-SNAPSHOT</jvpp.version>
   </properties>
 
   <dependencyManagement>
-- 
cgit 1.2.3-korg