diff options
| -rw-r--r-- | acl/acl-impl/pom.xml | 2 | ||||
| -rw-r--r-- | ioam/impl/pom.xml | 8 | ||||
| -rw-r--r-- | nat/nat2vpp/pom.xml | 2 | ||||
| -rw-r--r-- | nsh/impl/pom.xml | 9 | ||||
| -rw-r--r-- | packaging/deb/trusty/debian/control | 2 | ||||
| -rw-r--r-- | packaging/deb/xenial/debian/control | 2 | ||||
| -rw-r--r-- | packaging/rpm/honeycomb.spec | 2 | ||||
| -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, 19 insertions, 12 deletions
diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 3df24e346..6f2775561 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -29,7 +29,7 @@ <version>1.17.04-SNAPSHOT</version> <properties> - <jvpp.acl.version>1.0-SNAPSHOT</jvpp.acl.version> + <jvpp.acl.version>17.04-SNAPSHOT</jvpp.acl.version> </properties> <dependencies> diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index ec273f9e7..0b058a716 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.04-SNAPSHOT</ioam.version> + <jvpp.version>17.04-SNAPSHOT</jvpp.version> </properties> <dependencies> @@ -90,12 +90,12 @@ </dependency> <dependency> <groupId>io.fd.vpp</groupId> - <artifactId>jvpp-ioam-trace</artifactId> + <artifactId>jvpp-ioamtrace</artifactId> <version>${ioam.version}</version> </dependency> <dependency> <groupId>io.fd.vpp</groupId> - <artifactId>jvpp-ioam-pot</artifactId> + <artifactId>jvpp-ioampot</artifactId> <version>${ioam.version}</version> </dependency> <dependency> diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 79b68744e..a136961aa 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.04-SNAPSHOT</version> </dependency> <!-- Honeycomb infrastructure--> 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> diff --git a/packaging/deb/trusty/debian/control b/packaging/deb/trusty/debian/control index 9bd2d9613..79b2b61dd 100644 --- a/packaging/deb/trusty/debian/control +++ b/packaging/deb/trusty/debian/control @@ -9,6 +9,6 @@ Vcs-Browser: https://git.fd.io/cgit/honeycomb/tree/ Package: honeycomb Architecture: all -Depends: vpp (>= 17.01), vpp (<< 17.04), vpp-plugins (>= 17.01), vpp-plugins (<< 17.04), openjdk-8-jdk | openjdk-8-jre +Depends: vpp (>= 17.04), vpp (<< 17.08), vpp-plugins (>= 17.04), vpp-plugins (<< 17.08), openjdk-8-jdk | openjdk-8-jre Suggests: vpp-nsh-plugin Description: Honeycomb agent for VPP diff --git a/packaging/deb/xenial/debian/control b/packaging/deb/xenial/debian/control index 74071d4d0..2354ed79c 100644 --- a/packaging/deb/xenial/debian/control +++ b/packaging/deb/xenial/debian/control @@ -9,6 +9,6 @@ Vcs-Browser: https://git.fd.io/cgit/honeycomb/tree/ Package: honeycomb Architecture: all -Depends: vpp (>= 17.01), vpp (<< 17.04), vpp-plugins (>= 17.01), vpp-plugins (<< 17.04), openjdk-8-jdk | openjdk-8-jre +Depends: vpp (>= 17.04), vpp (<< 17.08), vpp-plugins (>= 17.04), vpp-plugins (<< 17.08), openjdk-8-jdk | openjdk-8-jre Suggests: vpp-nsh-plugin Description: Honeycomb agent for VPP diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index f702904dd..7047a340c 100644 --- a/packaging/rpm/honeycomb.spec +++ b/packaging/rpm/honeycomb.spec @@ -18,7 +18,7 @@ License: Apache-1.0 URL: http://www.fd.io Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip Source1: honeycomb.service -Requires: vpp >= 17.01, vpp < 17.04, vpp-plugins >= 17.01, vpp-plugins < 17.04, java >= 1:1.8.0 +Requires: vpp >= 17.04, vpp < 17.08, vpp-plugins >= 17.04, vpp-plugins < 17.08, java >= 1:1.8.0 # Required for creating honeycomb group Requires(pre): shadow-utils # Required for configuring systemd diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml index 265e9084e..2f2ad297e 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.04-SNAPSHOT</honeycomb.min.distro.version> - <jvpp.version>17.01-SNAPSHOT</jvpp.version> + <jvpp.version>17.04-SNAPSHOT</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 b8453a598..d2cdc5d14 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.04-SNAPSHOT</jvpp.version> </properties> <dependencyManagement> |