From 43a552b675e1c1a8f8cc618f91289cbee8be0ee2 Mon Sep 17 00:00:00 2001
From: Jan Srnicek <jsrnicek@cisco.com>
Date: Mon, 9 Jan 2017 09:02:23 +0100
Subject: Bump of jvpp version to 17.04

Depends on
https://gerrit.fd.io/r/#/c/4632/

Nsh stays on 17.01, till owner provides higher version

Change-Id: I1f51699b6809d30dd0272301ebb1074a42863618
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
---
 nsh/impl/pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'nsh')

diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index 76771081c..7e2114ee7 100644
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -89,12 +89,19 @@
     <dependency>
         <groupId>io.fd.vpp</groupId>
         <artifactId>jvpp-registry</artifactId>
-        <version>17.01-SNAPSHOT</version>
+        <version>17.04-SNAPSHOT</version>
     </dependency>
     <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>
     </dependency>
     <dependency>
       <groupId>io.fd.hc2vpp.common</groupId>
-- 
cgit 1.2.3-korg