summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-01-23 08:11:56 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-01-23 08:21:05 +0100
commit153c2954d71c94816dc604ba0fbb5ab7cf7c4205 (patch)
treef7bfd56432cfb78a23c47a9a7d8a9eb21ba59e76
parentbf5707db440d320642090e10fab56233e2399e0f (diff)
Bump jvpp version to 17.01
Change-Id: Iaff79021bfbce12b1b1ab80edea53be3bcf62660 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rw-r--r--acl/acl-impl/pom.xml2
-rw-r--r--ioam/impl/pom.xml4
-rw-r--r--nat/nat2vpp/pom.xml2
-rw-r--r--nsh/impl/pom.xml12
-rw-r--r--release-notes/pom.xml10
-rw-r--r--vpp-common/vpp-common-integration/pom.xml2
-rw-r--r--vpp-common/vpp-impl-parent/pom.xml2
7 files changed, 20 insertions, 14 deletions
diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 7f08ca762..5b720f313 100644
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -29,7 +29,7 @@
<version>1.17.01-SNAPSHOT</version>
<properties>
- <jvpp.acl.version>1.0-SNAPSHOT</jvpp.acl.version>
+ <jvpp.acl.version>17.01</jvpp.acl.version>
</properties>
<dependencies>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index 95366aa9d..40e391e6b 100644
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -29,8 +29,8 @@
<packaging>bundle</packaging>
<properties>
- <ioam.version>1.0-SNAPSHOT</ioam.version>
- <jvpp.version>17.01-SNAPSHOT</jvpp.version>
+ <ioam.version>17.01</ioam.version>
+ <jvpp.version>17.01</jvpp.version>
</properties>
<dependencies>
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index 4931df969..22836fd84 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>1.0-SNAPSHOT</version>
+ <version>17.01</version>
</dependency>
<!-- Honeycomb infrastructure-->
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index e6020168f..f905b2222 100644
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -89,12 +89,22 @@
<dependency>
<groupId>io.fd.vpp</groupId>
<artifactId>jvpp-registry</artifactId>
- <version>17.01-SNAPSHOT</version>
+ <version>17.01</version>
</dependency>
<dependency>
<groupId>io.fd.nsh_sfc</groupId>
<artifactId>nsh-sfc</artifactId>
+ <!--
+ todo: bump nsh and remove jvpp-registry exclusion
+ after nsh artifact (rc or final) is released
+ -->
<version>17.01-SNAPSHOT</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 da4f5513a..e508811fb 100644
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -79,13 +79,9 @@
<project-version-in-jira>10404</project-version-in-jira>
<project-branch>master</project-branch>
<project-vpp-version>17.01</project-vpp-version>
- <!-- TODO set snapshot version to project-vpp-version after VPP is released-->
- <!--<project-vpp-snapshot-version>17.01</project-vpp-snapshot-version>-->
- <project-vpp-snapshot-version>17.01-SNAPSHOT</project-vpp-snapshot-version>
- <project-snat-version>1.0</project-snat-version>
- <!-- TODO set snapshot version to project-snat-version after VPP is released-->
- <!--<project-snat-snapshot-version>1.0</project-snat-snapshot-version>-->
- <project-snat-snapshot-version>1.0-SNAPSHOT</project-snat-snapshot-version>
+ <project-vpp-snapshot-version>17.01</project-vpp-snapshot-version>
+ <project-snat-version>17.01</project-snat-version>
+ <project-snat-snapshot-version>17.01</project-snat-snapshot-version>
<project-git-web>https://git.fd.io/cgit/hc2vpp/tree</project-git-web>
</attributes>
</configuration>
diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml
index 8afad98be..5f610277a 100644
--- a/vpp-common/vpp-common-integration/pom.xml
+++ b/vpp-common/vpp-common-integration/pom.xml
@@ -29,7 +29,7 @@
<properties>
<honeycomb.min.distro.version>1.17.01-SNAPSHOT</honeycomb.min.distro.version>
- <jvpp.version>17.01-SNAPSHOT</jvpp.version>
+ <jvpp.version>17.01</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 4c6887425..2c5e391ad 100644
--- a/vpp-common/vpp-impl-parent/pom.xml
+++ b/vpp-common/vpp-impl-parent/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<properties>
- <jvpp.version>17.01-SNAPSHOT</jvpp.version>
+ <jvpp.version>17.01</jvpp.version>
</properties>
<dependencyManagement>