diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2017-05-02 08:00:30 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-05-02 08:34:09 +0200 |
commit | 49d72f953c34331427e45b6a8e7337ba0b8bceaa (patch) | |
tree | e95614df05eb25ace9a7481a7a373261d2e852a4 | |
parent | 3fed27fe786351f323715cc1af16130a29978319 (diff) |
Set hc2vpp version to 1.17.04.1-SNAPSHOT
Follows vpp's & honeycomb's development cycle.
Requires https://gerrit.fd.io/r/#/c/6543/
Change-Id: I91e5a08b3223e270e260ab8ece7e68179f8d2d31
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
62 files changed, 150 insertions, 150 deletions
diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 6f5a24c55..3ec956a3a 100644 --- a/acl/acl-api/pom.xml +++ b/acl/acl-api/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -24,7 +24,7 @@ <groupId>io.fd.hc2vpp.acl</groupId> <artifactId>acl-api</artifactId> <name>acl-api</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index ba8c3a6ed..f02de302e 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -20,17 +20,17 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.acl</groupId> <artifactId>acl-impl</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <properties> - <jvpp.acl.version>17.04</jvpp.acl.version> + <jvpp.acl.version>17.04-SNAPSHOT</jvpp.acl.version> </properties> <dependencies> diff --git a/acl/pom.xml b/acl/pom.xml index 3ec7f6579..bf00cde95 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>acl-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>acl-aggregator</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index dce23a1be..30d59cf51 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>pom</packaging> <build> diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index 865c5334a..0ea75be17 100644 --- a/common/hc2vpp-parent/pom.xml +++ b/common/hc2vpp-parent/pom.xml @@ -7,13 +7,13 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>honeycomb-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>pom</packaging> </project>
\ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index b9ed54c3b..e7ca6d784 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>pom</packaging> <!-- import dependencies from honeycomb impl-parent --> @@ -23,7 +23,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>${project.version}</version> + <version>1.17.04.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 0677a3b9e..da8af7329 100644 --- a/common/minimal-distribution-parent/pom.xml +++ b/common/minimal-distribution-parent/pom.xml @@ -7,13 +7,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> @@ -29,7 +29,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>${project.version}</version> + <version>1.17.04.1-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> @@ -131,7 +131,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>common-scripts</artifactId> - <version>${project.version}</version> + <version>1.17.04.1-SNAPSHOT</version> </dependency> </dependencies> </plugin> @@ -144,7 +144,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-assembly-descriptor</artifactId> - <version>${project.version}</version> + <version>1.17.04.1-SNAPSHOT</version> </dependency> </dependencies> <executions> diff --git a/common/pom.xml b/common/pom.xml index 50ed9cd32..3a335d95a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-common-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <description>Aggregator for common maven parents providing base configuration for Hc2vpp modules</description> diff --git a/dhcp/dhcp-api/pom.xml b/dhcp/dhcp-api/pom.xml index 9ed855599..3fe889780 100644 --- a/dhcp/dhcp-api/pom.xml +++ b/dhcp/dhcp-api/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -24,7 +24,7 @@ <groupId>io.fd.hc2vpp.dhcp</groupId> <artifactId>dhcp-api</artifactId> <name>dhcp-api</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 4c3cea91c..d4aaee4e7 100644 --- a/dhcp/dhcp-impl/pom.xml +++ b/dhcp/dhcp-impl/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -24,7 +24,7 @@ <groupId>io.fd.hc2vpp.dhcp</groupId> <artifactId>dhcp-impl</artifactId> <name>dhcp-impl</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> @@ -69,7 +69,7 @@ <dependency> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-impl</artifactId> - <version>${project.version}</version> + <version>1.17.04.1-SNAPSHOT</version> </dependency> diff --git a/dhcp/pom.xml b/dhcp/pom.xml index f18168200..79d55db4c 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>dhcp-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>dhcp-aggregator</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index f594d89c6..e6c496bff 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -26,7 +26,7 @@ <groupId>io.fd.hc2vpp.ioam</groupId> <artifactId>vppioam-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 6552d1529..26ff85e64 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> @@ -26,12 +26,12 @@ <groupId>io.fd.hc2vpp.ioam</groupId> <artifactId>vppioam-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <ioam.version>17.04</ioam.version> - <jvpp.version>17.04</jvpp.version> + <ioam.version>17.04-SNAPSHOT</ioam.version> + <jvpp.version>17.04-SNAPSHOT</jvpp.version> </properties> <dependencies> diff --git a/ioam/pom.xml b/ioam/pom.xml index 710d0f33a..a9df157c4 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.ioam</groupId> <artifactId>vppioam-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index 0d361ee78..348908b4b 100644 --- a/it/api-test/pom.xml +++ b/it/api-test/pom.xml @@ -21,13 +21,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>api-test</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/it/pom.xml b/it/pom.xml index 538add218..5426199a8 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jvpp-version b/jvpp-version index cde36c554..416238ec3 100755 --- a/jvpp-version +++ b/jvpp-version @@ -1,2 +1,2 @@ #!/bin/sh -echo 17.04 +echo 17.04-SNAPSHOT diff --git a/l3/api/pom.xml b/l3/api/pom.xml index 9abb824d4..9ca63eaa8 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.l3</groupId> <artifactId>l3-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index ac582d390..0a8f41d44 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.l3</groupId> <artifactId>l3-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/l3/pom.xml b/l3/pom.xml index 2f9558bcf..f7acd837e 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hc2vpp-parent</artifactId> <groupId>io.fd.hc2vpp.common</groupId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <packaging>pom</packaging> diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index cf96f209e..54c63defd 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.l3</groupId> <artifactId>l3-utils</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index a44db6729..a2f252a44 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -26,12 +26,12 @@ <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> <project.translate.groupId>io.fd.honeycomb</project.translate.groupId> - <naming.context.version>1.17.04</naming.context.version> + <naming.context.version>1.17.04.1-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 7ee035c69..7ba45754b 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -27,7 +27,7 @@ <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp2vpp</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/lisp/pom.xml b/lisp/pom.xml index b273d5f6e..475f1880e 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/nat/nat-api/pom.xml b/nat/nat-api/pom.xml index a1b458e7f..794cd49f2 100644 --- a/nat/nat-api/pom.xml +++ b/nat/nat-api/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -25,11 +25,11 @@ <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <naming.context.version>1.17.04</naming.context.version> + <naming.context.version>1.17.04.1-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 60a6785d7..d827c3c74 100644 --- a/nat/nat2vpp/pom.xml +++ b/nat/nat2vpp/pom.xml @@ -18,19 +18,19 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat2vpp</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <honeycomb.infra.version>1.17.04</honeycomb.infra.version> - <hc2vpp.common.version>1.17.04</hc2vpp.common.version> + <honeycomb.infra.version>1.17.04.1-SNAPSHOT</honeycomb.infra.version> + <hc2vpp.common.version>1.17.04.1-SNAPSHOT</hc2vpp.common.version> </properties> <dependencies> @@ -54,7 +54,7 @@ <dependency> <groupId>io.fd.vpp</groupId> <artifactId>jvpp-snat</artifactId> - <version>17.04</version> + <version>17.04-SNAPSHOT</version> </dependency> <!-- Honeycomb infrastructure--> diff --git a/nat/pom.xml b/nat/pom.xml index 40fb7baf6..f921948ae 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>nat-aggregator</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index c398eeb5f..86bd79d00 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -26,7 +26,7 @@ <groupId>io.fd.hc2vpp.nsh</groupId> <artifactId>vppnsh-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index ddb9acb32..7d755c10e 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> @@ -25,7 +25,7 @@ <groupId>io.fd.hc2vpp.nsh</groupId> <artifactId>vppnsh-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> @@ -89,12 +89,12 @@ <dependency> <groupId>io.fd.vpp</groupId> <artifactId>jvpp-registry</artifactId> - <version>17.04</version> + <version>17.04-SNAPSHOT</version> </dependency> <dependency> <groupId>io.fd.nsh_sfc</groupId> <artifactId>nsh-sfc</artifactId> - <version>17.04</version> + <version>17.04-SNAPSHOT</version> </dependency> <dependency> <groupId>io.fd.hc2vpp.common</groupId> diff --git a/nsh/pom.xml b/nsh/pom.xml index 83161f6d1..491c052b7 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nsh</groupId> <artifactId>vppnsh-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index a23832cec..69d535389 100755 --- a/packaging/deb/common/prepare.sh +++ b/packaging/deb/common/prepare.sh @@ -14,9 +14,9 @@ BUILD_DEPENDENCIES=$($5) # Copy and unpack the archive with vpp-integration distribution ARCHIVE_DIR=${SOURCE_DIR}/../../../vpp-integration/minimal-distribution/target/ -ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz cp ${ARCHIVE} ${SOURCE_DIR} -ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-hc.tar.gz +ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/ # Create packaging root @@ -24,7 +24,7 @@ rm -rf ${BUILD_DIR} mkdir ${BUILD_DIR} # Copy contents of tar.gz -mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}/ ${BUILD_DIR}/ +mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${BUILD_DIR}/ cp -r $2 ${BUILD_DIR} # OS service definition @@ -41,7 +41,7 @@ EOT # Install instructions cat <<EOT >> ${BUILD_DIR}/debian/install -vpp-integration-distribution-${VERSION}/* /opt/honeycomb/ +vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/ $3 $4 EOT diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index d759d8bb7..3c4e7efde 100644 --- a/packaging/rpm/honeycomb.spec +++ b/packaging/rpm/honeycomb.spec @@ -17,7 +17,7 @@ Summary: fd.io Honeycomb Group: Applications/Communications License: Apache-1.0 URL: http://www.fd.io -Source0: vpp-integration-distribution-%{_version}-hc.zip +Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip Source1: honeycomb.service Requires: %{_vpp_dependencies}, java >= 1:1.8.0 # Required for creating honeycomb group @@ -38,13 +38,13 @@ fd.io Honeycomb %prep # Extract Source0 (Honeycomb archive) -%autosetup -n vpp-integration-distribution-%{_version} +%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT %install # Create directory in build root for Honeycomb mkdir -p $RPM_BUILD_ROOT/opt/%name # Copy Honeycomb from archive to its dir in build root -cp -r ../vpp-integration-distribution-%{_version}/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name # Create directory in build root for systemd .service file mkdir -p $RPM_BUILD_ROOT/%{_unitdir} # Copy Honeycomb's systemd .service file to correct dir in build root diff --git a/packaging/rpm/release b/packaging/rpm/release index 86a2f4dc4..4de82e41c 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,10 +1,10 @@ #!/bin/bash # release version -echo RELEASE +# echo RELEASE # # snapshot version # # Increasing the build number by a certain margin. # Necessary due to honeycomb - hc2vpp split. Build_number counter was reset # rewriting older packages -# echo $(expr $BUILD_NUMBER + 2000)
\ No newline at end of file +echo $(expr $BUILD_NUMBER + 2000)
\ No newline at end of file diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index fbe2ab22d..3af99961d 100755 --- a/packaging/rpm/rpmbuild.sh +++ b/packaging/rpm/rpmbuild.sh @@ -3,7 +3,7 @@ set -xe DIR=$(dirname $0) DIR=$(readlink -f $DIR) ZIPDIR=${DIR}/../../vpp-integration/minimal-distribution/target/ -ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04.1-SNAPSHOT-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ diff --git a/packaging/rpm/version b/packaging/rpm/version index f0bea456b..a05c531a0 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.17.04 +echo 1.17.04.1 @@ -17,13 +17,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>hc2vpp-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>hc2vpp</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/release-notes/pom.xml b/release-notes/pom.xml index 02a44976a..8e8f9d530 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>release-notes-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/routing/pom.xml b/routing/pom.xml index 41a1181e4..4882a08ec 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml index 8349d2088..2721c8382 100644 --- a/routing/routing-api/pom.xml +++ b/routing/routing-api/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-api</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index a19d124fd..4d7525d43 100644 --- a/routing/routing-impl/pom.xml +++ b/routing/routing-impl/pom.xml @@ -20,14 +20,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-impl</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/pom.xml b/samples/pom.xml index b8b56d00d..abe1f794c 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>hc2vpp-parent</artifactId> <groupId>io.fd.hc2vpp.common</groupId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/samples/samples-api/pom.xml b/samples/samples-api/pom.xml index e664c46dd..1d4325419 100644 --- a/samples/samples-api/pom.xml +++ b/samples/samples-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -13,7 +13,7 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>samples-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 686e73819..b509d12e3 100644 --- a/samples/samples-impl/pom.xml +++ b/samples/samples-impl/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>samples-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <dependencies> <!-- Api classes generated from yang model --> diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index fcd09fa4a..c62a26625 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -25,7 +25,7 @@ <groupId>io.fd.hc2vpp.v3po</groupId> <artifactId>v3po-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/v3po/pom.xml b/v3po/pom.xml index 623515d56..2af924f69 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.v3po</groupId> <artifactId>v3po-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index 14d4b6c65..0e2cc10ea 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -27,7 +27,7 @@ <groupId>io.fd.hc2vpp.v3po</groupId> <artifactId>v3po2vpp</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index d1d3a10f1..1eadf2dde 100644 --- a/vpp-classifier/api/pom.xml +++ b/vpp-classifier/api/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.vpp.classifier</groupId> <artifactId>vpp-classifier-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index 29a96099c..aba7cdc61 100644 --- a/vpp-classifier/impl/pom.xml +++ b/vpp-classifier/impl/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -30,14 +30,14 @@ <groupId>io.fd.hc2vpp.vpp.classifier</groupId> <artifactId>vpp-classifier-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <dependencies> <!-- Api --> <dependency> <groupId>io.fd.hc2vpp.vpp.classifier</groupId> <artifactId>vpp-classifier-api</artifactId> - <version>${project.version}</version> + <version>1.17.04.1-SNAPSHOT</version> </dependency> <!-- TODO - HC2VPP-97 - change to sub-interface-api dependency once module is present diff --git a/vpp-classifier/pom.xml b/vpp-classifier/pom.xml index e4786fece..4a7880220 100644 --- a/vpp-classifier/pom.xml +++ b/vpp-classifier/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/vpp-common/naming-context-api/pom.xml b/vpp-common/naming-context-api/pom.xml index 08c0512fd..4983e2e19 100644 --- a/vpp-common/naming-context-api/pom.xml +++ b/vpp-common/naming-context-api/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -26,7 +26,7 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>naming-context-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml index 7832fb1a7..cba66666f 100644 --- a/vpp-common/naming-context-impl/pom.xml +++ b/vpp-common/naming-context-impl/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> @@ -27,7 +27,7 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>naming-context-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index 41e52a241..8632bf02b 100644 --- a/vpp-common/pom.xml +++ b/vpp-common/pom.xml @@ -18,13 +18,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-common-aggregator</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/vpp-common/vpp-common-integration/pom.xml b/vpp-common/vpp-common-integration/pom.xml index 422a0cc91..67fbdb36b 100644 --- a/vpp-common/vpp-common-integration/pom.xml +++ b/vpp-common/vpp-common-integration/pom.xml @@ -19,18 +19,18 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-common-integration</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <properties> - <honeycomb.min.distro.version>1.17.04</honeycomb.min.distro.version> - <jvpp.version>17.04</jvpp.version> + <honeycomb.min.distro.version>1.17.04.1-SNAPSHOT</honeycomb.min.distro.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 f5d1da012..dd219ac68 100644 --- a/vpp-common/vpp-impl-parent/pom.xml +++ b/vpp-common/vpp-impl-parent/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> @@ -27,11 +27,11 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>pom</packaging> <properties> - <jvpp.version>17.04</jvpp.version> + <jvpp.version>17.04-SNAPSHOT</jvpp.version> </properties> <dependencyManagement> diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml index 867956960..528f149da 100644 --- a/vpp-common/vpp-translate-test/pom.xml +++ b/vpp-common/vpp-translate-test/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>vpp-translate-test</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml index 16cb56cdf..5cb122415 100644 --- a/vpp-common/vpp-translate-utils/pom.xml +++ b/vpp-common/vpp-translate-utils/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>vpp-translate-utils</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index 728271df3..e126114aa 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/minimal-distribution-parent</relativePath> </parent> @@ -27,22 +27,22 @@ <groupId>io.fd.hc2vpp.integration</groupId> <artifactId>vpp-integration-distribution</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <properties> <main.class>io.fd.honeycomb.infra.distro.Main</main.class> - <v3po.version>1.17.04</v3po.version> - <lisp.version>1.17.04</lisp.version> - <vpp.common.integration.version>1.17.04</vpp.common.integration.version> - <vppnsh.version>1.17.04</vppnsh.version> - <nat.version>1.17.04</nat.version> - <ioam.version>1.17.04</ioam.version> - <routing.version>1.17.04</routing.version> - <acl.version>1.17.04</acl.version> - <dhcp.version>1.17.04</dhcp.version> - <vpp.classifier.version>1.17.04</vpp.classifier.version> - <l3-impl.version>1.17.04</l3-impl.version> - <vpp-management-impl.version>1.17.04</vpp-management-impl.version> + <v3po.version>1.17.04.1-SNAPSHOT</v3po.version> + <lisp.version>1.17.04.1-SNAPSHOT</lisp.version> + <vpp.common.integration.version>1.17.04.1-SNAPSHOT</vpp.common.integration.version> + <vppnsh.version>1.17.04.1-SNAPSHOT</vppnsh.version> + <nat.version>1.17.04.1-SNAPSHOT</nat.version> + <ioam.version>1.17.04.1-SNAPSHOT</ioam.version> + <routing.version>1.17.04.1-SNAPSHOT</routing.version> + <acl.version>1.17.04.1-SNAPSHOT</acl.version> + <dhcp.version>1.17.04.1-SNAPSHOT</dhcp.version> + <vpp.classifier.version>1.17.04.1-SNAPSHOT</vpp.classifier.version> + <l3-impl.version>1.17.04.1-SNAPSHOT</l3-impl.version> + <vpp-management-impl.version>1.17.04.1-SNAPSHOT</vpp-management-impl.version> <distribution.modules> io.fd.hc2vpp.common.integration.VppCommonModule, diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index 219379ed0..840ad6586 100644 --- a/vpp-integration/pom.xml +++ b/vpp-integration/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.integration</groupId> <artifactId>vpp-integration</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> <description>Aggregator for Honeycomb's VPP distribution. Aggregating all Hc2vpp plugins.</description> diff --git a/vpp-management/api/pom.xml b/vpp-management/api/pom.xml index c258e50f0..5e6e7e86c 100644 --- a/vpp-management/api/pom.xml +++ b/vpp-management/api/pom.xml @@ -23,11 +23,11 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-api</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> </project>
\ No newline at end of file diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index 22d77bce4..61c4ec105 100644 --- a/vpp-management/impl/pom.xml +++ b/vpp-management/impl/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-impl</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <dependencies> <!-- Api --> diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index 24983e083..c6a07353d 100644 --- a/vpp-management/pom.xml +++ b/vpp-management/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> @@ -31,7 +31,7 @@ <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-aggregator</artifactId> <name>${project.artifactId}</name> - <version>1.17.04</version> + <version>1.17.04.1-SNAPSHOT</version> <description>Aggregator for Hc2vpp vpp-management plugin</description> <modules> diff --git a/vpp-version b/vpp-version index f64171254..fea07c41e 100755 --- a/vpp-version +++ b/vpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo '17.04-release' +echo 'RELEASE' # Determines which VPP version to use in hc2vpp-integration job. # 'RELEASE' will use the latest VPP in the respective branch. |