summaryrefslogtreecommitdiffstats
path: root/nsh/impl
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2017-01-09 09:02:23 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-01-11 14:50:33 +0100
commit43a552b675e1c1a8f8cc618f91289cbee8be0ee2 (patch)
tree3623c20f77466aa1ca7cf5ec45528215be5627b2 /nsh/impl
parent2d92edf65ee34329d9226e2efe90a5d10265cd72 (diff)
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>
Diffstat (limited to 'nsh/impl')
-rw-r--r--nsh/impl/pom.xml9
1 files changed, 8 insertions, 1 deletions
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>