summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-10-30 14:38:00 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-10-31 13:31:19 +0000
commit4ab125c86db6885c1e9c37f19b6a2b483e9c8c63 (patch)
tree137416b33ffb8e31d18d75471fe5fc08aab12b31
parent549b5d58d22ec1191e3ac5bd09cb8d69488ec8e3 (diff)
Set jvpp version to 17.10
Change-Id: If6ca87e134380d0a0e9814d87cf1c3f787072c5a 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--it/api-coverage/pom.xml2
-rwxr-xr-xjvpp-version2
-rw-r--r--nat/nat2vpp/pom.xml2
-rw-r--r--nsh/impl/pom.xml4
-rw-r--r--release-notes/pom.xml8
-rw-r--r--vpp-common/vpp-common-integration/pom.xml2
-rw-r--r--vpp-common/vpp-impl-parent/pom.xml2
-rw-r--r--vpp-integration/api-docs/core/pom.xml2
-rw-r--r--vpp-integration/api-docs/scripts/pom.xml2
11 files changed, 14 insertions, 18 deletions
diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml
index 638ea54c2..14df33901 100644
--- a/acl/acl-impl/pom.xml
+++ b/acl/acl-impl/pom.xml
@@ -30,7 +30,7 @@
<version>1.17.10-SNAPSHOT</version>
<properties>
- <jvpp.acl.version>17.10-SNAPSHOT</jvpp.acl.version>
+ <jvpp.acl.version>17.10</jvpp.acl.version>
</properties>
<dependencies>
diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml
index f7c122f18..67ef26087 100644
--- a/ioam/impl/pom.xml
+++ b/ioam/impl/pom.xml
@@ -30,8 +30,8 @@
<packaging>bundle</packaging>
<properties>
- <ioam.version>17.10-SNAPSHOT</ioam.version>
- <jvpp.version>17.10-SNAPSHOT</jvpp.version>
+ <ioam.version>17.10</ioam.version>
+ <jvpp.version>17.10</jvpp.version>
</properties>
<dependencies>
diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml
index 9d7f226a7..75908bbcd 100644
--- a/it/api-coverage/pom.xml
+++ b/it/api-coverage/pom.xml
@@ -32,7 +32,7 @@
<name>${project.artifactId}</name>
<properties>
- <jvpp.version>17.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>17.10</jvpp.version>
</properties>
<dependencies>
diff --git a/jvpp-version b/jvpp-version
index f90935b34..6655d7026 100755
--- a/jvpp-version
+++ b/jvpp-version
@@ -5,4 +5,4 @@
#
# Version should match the one used in pom files.
#
-echo 17.10-SNAPSHOT
+echo 17.10
diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml
index 479a96fef..01bdbcc12 100644
--- a/nat/nat2vpp/pom.xml
+++ b/nat/nat2vpp/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>io.fd.vpp</groupId>
<artifactId>jvpp-nat</artifactId>
- <version>17.10-SNAPSHOT</version>
+ <version>17.10</version>
</dependency>
<!-- Honeycomb infrastructure-->
diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml
index 1eb7588c6..9ecc7626b 100644
--- a/nsh/impl/pom.xml
+++ b/nsh/impl/pom.xml
@@ -89,12 +89,12 @@
<dependency>
<groupId>io.fd.vpp</groupId>
<artifactId>jvpp-registry</artifactId>
- <version>17.10-SNAPSHOT</version>
+ <version>17.10</version>
</dependency>
<dependency>
<groupId>io.fd.nsh_sfc</groupId>
<artifactId>nsh-sfc</artifactId>
- <version>17.10-SNAPSHOT</version>
+ <version>17.10</version>
</dependency>
<dependency>
<groupId>io.fd.hc2vpp.common</groupId>
diff --git a/release-notes/pom.xml b/release-notes/pom.xml
index 1449ba4a6..b34c6b85f 100644
--- a/release-notes/pom.xml
+++ b/release-notes/pom.xml
@@ -110,13 +110,9 @@
<project-version-in-jira>10800</project-version-in-jira>
<project-branch>stable/1710</project-branch>
<project-vpp-version>17.10</project-vpp-version>
- <!-- TODO set snapshot version to project-vpp-version after VPP is released-->
- <!--<project-vpp-snapshot-version>17.10</project-vpp-snapshot-version>-->
- <project-vpp-snapshot-version>17.10-SNAPSHOT</project-vpp-snapshot-version>
+ <project-vpp-snapshot-version>17.10</project-vpp-snapshot-version>
<project-nat-version>17.10</project-nat-version>
- <!-- TODO set snapshot version to project-nat-version after VPP is released-->
- <!--<project-nat-snapshot-version>17.10</project-nat-snapshot-version>-->
- <project-nat-snapshot-version>17.10-SNAPSHOT</project-nat-snapshot-version>
+ <project-nat-snapshot-version>17.10</project-nat-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 6bdbe2d6a..83a7fffec 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.10-SNAPSHOT</honeycomb.min.distro.version>
- <jvpp.version>17.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>17.10</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 5962719fe..4554cfb33 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.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>17.10</jvpp.version>
</properties>
<dependencyManagement>
diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml
index 857f7b2dd..de50e2bbc 100644
--- a/vpp-integration/api-docs/core/pom.xml
+++ b/vpp-integration/api-docs/core/pom.xml
@@ -37,7 +37,7 @@
<asm.version>5.2</asm.version>
<asciidoctorj.version>1.5.4</asciidoctorj.version>
<slf4j-simple.version>1.7.25</slf4j-simple.version>
- <jvpp.version>17.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>17.10</jvpp.version>
<guava.version>19.0</guava.version>
<reflections.version>0.9.11</reflections.version>
diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml
index 086e6f257..e69b4f11c 100644
--- a/vpp-integration/api-docs/scripts/pom.xml
+++ b/vpp-integration/api-docs/scripts/pom.xml
@@ -29,7 +29,7 @@
<groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
<groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
- <jvpp.version>17.10-SNAPSHOT</jvpp.version>
+ <jvpp.version>17.10</jvpp.version>
<junit.version>4.12</junit.version>
<reflections.version>0.9.11</reflections.version>
<sonar.skip>true</sonar.skip>