From: Marek Gradzki <mgradzki@cisco.com>
Date: Mon, 27 Feb 2017 06:48:53 +0000 (+0100)
Subject: Bump NSH version to 17.04-SNAPSHOT
X-Git-Tag: v1.17.04-RC1~35
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F29%2F5529%2F1;p=hc2vpp.git

Bump NSH version to 17.04-SNAPSHOT

Change-Id: Iea99737616deb7612058b93b36e548e178a80ed9
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---

diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index 7e2114ee7..c6de030e9 100644
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -94,14 +94,7 @@
     <dependency>
         <groupId>io.fd.nsh_sfc</groupId>
         <artifactId>nsh-sfc</artifactId>
-        <version>17.01-SNAPSHOT</version>
-        <exclusions>
-            <!-- To prevent conflict with 17.04 jvpp -->
-            <exclusion>
-                <groupId>io.fd.vpp</groupId>
-                <artifactId>jvpp-registry</artifactId>
-            </exclusion>
-        </exclusions>
+        <version>17.04-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.common</groupId>