diff options
| -rw-r--r-- | acl/acl-impl/pom.xml | 2 | ||||
| -rw-r--r-- | ioam/impl/pom.xml | 4 | ||||
| -rw-r--r-- | it/api-coverage/pom.xml | 2 | ||||
| -rwxr-xr-x | jvpp-version | 2 | ||||
| -rw-r--r-- | nat/nat2vpp/pom.xml | 2 | ||||
| -rw-r--r-- | nsh/impl/pom.xml | 8 | ||||
| -rw-r--r-- | release-notes/pom.xml | 8 | ||||
| -rw-r--r-- | vpp-common/vpp-common-integration/pom.xml | 2 | ||||
| -rw-r--r-- | vpp-common/vpp-impl-parent/pom.xml | 2 |
9 files changed, 17 insertions, 15 deletions
diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 18d1eb92f..39766cc56 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -30,7 +30,7 @@ <version>1.17.07-SNAPSHOT</version> <properties> - <jvpp.acl.version>17.07-SNAPSHOT</jvpp.acl.version> + <jvpp.acl.version>17.07</jvpp.acl.version> </properties> <dependencies> diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index e1f8ce243..92c67f23f 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -30,8 +30,8 @@ <packaging>bundle</packaging> <properties> - <ioam.version>17.07-SNAPSHOT</ioam.version> - <jvpp.version>17.07-SNAPSHOT</jvpp.version> + <ioam.version>17.07</ioam.version> + <jvpp.version>17.07</jvpp.version> </properties> <dependencies> diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index 4c939ffeb..3dc94112f 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.07-SNAPSHOT</jvpp.version> + <jvpp.version>17.07</jvpp.version> </properties> <dependencies> diff --git a/jvpp-version b/jvpp-version index 5543a4092..90098a571 100755 --- a/jvpp-version +++ b/jvpp-version @@ -1,2 +1,2 @@ #!/bin/sh -echo 17.07-SNAPSHOT +echo 17.07 diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 7a16ca0e7..d4a87a155 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>17.07-SNAPSHOT</version> + <version>17.07</version> </dependency> <!-- Honeycomb infrastructure--> diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 33c79936b..21cf2d911 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -89,12 +89,18 @@ <dependency> <groupId>io.fd.vpp</groupId> <artifactId>jvpp-registry</artifactId> - <version>17.07-SNAPSHOT</version> + <version>17.07</version> </dependency> <dependency> <groupId>io.fd.nsh_sfc</groupId> <artifactId>nsh-sfc</artifactId> <version>17.07-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 63950ee6d..c06c22cf9 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -80,13 +80,9 @@ <project-version-in-jira>10701</project-version-in-jira> <project-branch>master</project-branch> <project-vpp-version>17.07</project-vpp-version> - <!-- TODO set snapshot version to project-vpp-version after VPP is released--> - <!--<project-vpp-snapshot-version>17.07</project-vpp-snapshot-version>--> - <project-vpp-snapshot-version>17.07-SNAPSHOT</project-vpp-snapshot-version> + <project-vpp-snapshot-version>17.07</project-vpp-snapshot-version> <project-snat-version>17.07</project-snat-version> - <!-- TODO set snapshot version to project-snat-version after VPP is released--> - <!--<project-snat-snapshot-version>17.07</project-snat-snapshot-version>--> - <project-snat-snapshot-version>17.07-SNAPSHOT</project-snat-snapshot-version> + <project-snat-snapshot-version>17.07</project-snat-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 7ba7d6359..37400eff0 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.07-SNAPSHOT</honeycomb.min.distro.version> - <jvpp.version>17.07-SNAPSHOT</jvpp.version> + <jvpp.version>17.07</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 1997027e0..7b873f7e0 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.07-SNAPSHOT</jvpp.version> + <jvpp.version>17.07</jvpp.version> </properties> <dependencyManagement> |