diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-04-30 10:20:49 +0200 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-04-30 10:20:49 +0200 |
| commit | 6223fd97f1113ad6dfc13fbc93fa911b460cf091 (patch) | |
| tree | 7cbfd869f693cf87cfb56a7007653b8fdd610cae | |
| parent | 54e6b9fa3628effde621eeebe91722d9e32bea95 (diff) | |
Set Hc2vpp version to 1.18.04.1-SNAPSHOT
Change-Id: Ie2307b319b361b9dc29e5293c3163e4f53856311
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
75 files changed, 162 insertions, 162 deletions
diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 8f5c49260..d167e48aa 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 974aadc23..09a4ea2c5 100644 --- a/acl/acl-impl/pom.xml +++ b/acl/acl-impl/pom.xml @@ -20,14 +20,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <properties> <jvpp.acl.version>18.04</jvpp.acl.version> diff --git a/acl/pom.xml b/acl/pom.xml index fec015e81..d4f324db2 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>acl-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>acl-aggregator</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/bgp/bgp-prefix-sid/pom.xml b/bgp/bgp-prefix-sid/pom.xml index 0a93d597e..d131c8486 100644 --- a/bgp/bgp-prefix-sid/pom.xml +++ b/bgp/bgp-prefix-sid/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -13,7 +13,7 @@ <groupId>io.fd.hc2vpp.bgp</groupId> <artifactId>bgp-prefix-sid</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index c2adcdc78..8aed04e8d 100644 --- a/bgp/inet/pom.xml +++ b/bgp/inet/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -13,7 +13,7 @@ <groupId>io.fd.hc2vpp.bgp</groupId> <artifactId>bgp-inet</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/bgp/pom.xml b/bgp/pom.xml index 565cd57c3..26fba2487 100644 --- a/bgp/pom.xml +++ b/bgp/pom.xml @@ -19,13 +19,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.bgp</groupId> <artifactId>bgp-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index b7a376d14..9ea40aebc 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>pom</packaging> <build> diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index e23464b4e..b2ab51fbb 100644 --- a/common/hc2vpp-parent/pom.xml +++ b/common/hc2vpp-parent/pom.xml @@ -7,17 +7,17 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>honeycomb-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>pom</packaging> <properties> - <honeycomb.version>1.18.04</honeycomb.version> + <honeycomb.version>1.18.04.1-SNAPSHOT</honeycomb.version> </properties> </project>
\ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index cc92f9c08..b95f37b88 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>pom</packaging> <dependencyManagement> @@ -23,7 +23,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.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 9434e13da..5e7b07b60 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>impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> diff --git a/common/pom.xml b/common/pom.xml index 5f4f2545e..fd5506cbf 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-common-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.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 dadf67b61..6061bd3e2 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 6cbdc62b1..355da6846 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> @@ -67,7 +67,7 @@ <dependency> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-impl</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> </dependency> diff --git a/dhcp/pom.xml b/dhcp/pom.xml index 8aff781fc..93317faea 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>dhcp-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>dhcp-aggregator</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/interface-role/api/pom.xml b/interface-role/api/pom.xml index 44b2eaeb5..2b2f72346 100644 --- a/interface-role/api/pom.xml +++ b/interface-role/api/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.iface.role</groupId> <artifactId>api</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index d5516281c..14d2d9ce1 100644 --- a/interface-role/impl/pom.xml +++ b/interface-role/impl/pom.xml @@ -23,13 +23,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.iface.role</groupId> <artifactId>impl</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/interface-role/pom.xml b/interface-role/pom.xml index 5bdbf6882..09afebe81 100644 --- a/interface-role/pom.xml +++ b/interface-role/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>hc2vpp-parent</artifactId> <groupId>io.fd.hc2vpp.common</groupId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> @@ -14,7 +14,7 @@ <groupId>io.fd.hc2vpp.iface.role</groupId> <artifactId>interface-role-aggregator</artifactId> <packaging>pom</packaging> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <modules> diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index ef18747b4..3316b1e41 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 79509193f..37c8c1ca6 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> @@ -26,7 +26,7 @@ <groupId>io.fd.hc2vpp.ioam</groupId> <artifactId>vppioam-impl</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/ioam/pom.xml b/ioam/pom.xml index 12a2208aa..42cfdf019 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.ioam</groupId> <artifactId>vppioam-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/it/api-coverage/pom.xml b/it/api-coverage/pom.xml index 2f0a6137b..911e6770f 100644 --- a/it/api-coverage/pom.xml +++ b/it/api-coverage/pom.xml @@ -21,14 +21,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.it</groupId> <artifactId>api-coverage</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <properties> diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index 40a286266..ebb1f2ef6 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>api-test</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/it/pom.xml b/it/pom.xml index 8754c6c51..cea97edde 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/l3/api/pom.xml b/l3/api/pom.xml index 751e14012..48fd678b8 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 6abbe57a0..fe87a8159 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/l3/pom.xml b/l3/pom.xml index 8ce2c5eba..a6fa8f47a 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.18.04</version> + <version>1.18.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 da7e1264e..6d0d568d8 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index a7d1062b9..d23c585d7 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> <project.translate.groupId>io.fd.honeycomb</project.translate.groupId> - <naming.context.version>1.18.04</naming.context.version> + <naming.context.version>1.18.04.1-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 2f07ca807..fa50d2228 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/lisp/pom.xml b/lisp/pom.xml index 8a5d16743..92732f27b 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/mpls/api/pom.xml b/mpls/api/pom.xml index 5855aa625..4013c3b6a 100644 --- a/mpls/api/pom.xml +++ b/mpls/api/pom.xml @@ -21,14 +21,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.mpls</groupId> <artifactId>mpls-api</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/mpls/impl/pom.xml b/mpls/impl/pom.xml index cef79a23a..5bb0b6f75 100644 --- a/mpls/impl/pom.xml +++ b/mpls/impl/pom.xml @@ -21,14 +21,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.mpls</groupId> <artifactId>mpls-impl</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/mpls/pom.xml b/mpls/pom.xml index 3d6fda6f4..cfb209ce2 100644 --- a/mpls/pom.xml +++ b/mpls/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.mpls</groupId> <artifactId>mpls-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.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 757249a41..9685d8320 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <naming.context.version>1.18.04</naming.context.version> + <naming.context.version>1.18.04.1-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 7cf4a72e0..37007bd10 100644 --- a/nat/nat2vpp/pom.xml +++ b/nat/nat2vpp/pom.xml @@ -18,18 +18,18 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> - <version>1.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <hc2vpp.common.version>1.18.04</hc2vpp.common.version> + <hc2vpp.common.version>1.18.04.1-SNAPSHOT</hc2vpp.common.version> </properties> <dependencies> diff --git a/nat/pom.xml b/nat/pom.xml index 4bf436669..40010b1e8 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.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 74ff87268..96ea7c884 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index a3a862e23..5846c71e9 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/nsh/pom.xml b/nsh/pom.xml index 5ac37143e..085f2611c 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nsh</groupId> <artifactId>vppnsh-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.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 b58b98ad6..585c3a27e 100755 --- a/packaging/deb/common/prepare.sh +++ b/packaging/deb/common/prepare.sh @@ -35,7 +35,7 @@ cp ${SOURCE_DIR}/$3 ${BUILD_DIR} cat <<EOT >> ${BUILD_DIR}/debian/changelog honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low - * 18.04 release + * 18.04.1 release -- mgradzki <mgradzki@cisco.com> Mon, 23 Feb 2016 09:41:37 +0200 EOT diff --git a/packaging/rpm/hc2vpp_version b/packaging/rpm/hc2vpp_version index fdecc27fb..a084540e3 100755 --- a/packaging/rpm/hc2vpp_version +++ b/packaging/rpm/hc2vpp_version @@ -6,7 +6,7 @@ DIR_NAME=$(dirname $0) VERSION=`$DIR_NAME/version` -# echo "${VERSION}-SNAPSHOT" +echo "${VERSION}-SNAPSHOT" # echo "${VERSION}-RC1" # echo "${VERSION}-RC2" -echo "${VERSION}" +# echo "${VERSION}" diff --git a/packaging/rpm/release b/packaging/rpm/release index 3425b44f8..aacfba096 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -16,7 +16,7 @@ # echo RC2 # # Release snapshot (1.18.04~XXX, 1.18.04.1~XXX, ...) -# echo RELEASE~$BUILD_NUMBER +echo RELEASE~$BUILD_NUMBER # # Release version (1.18.04, 1.18.04.1, ...) -echo RELEASE
\ No newline at end of file +# echo RELEASE
\ No newline at end of file diff --git a/packaging/rpm/version b/packaging/rpm/version index 9eab6983f..3a0ad5971 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.18.04 +echo 1.18.04.1 @@ -17,13 +17,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>hc2vpp-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.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 4a90c94ed..0c410e103 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>release-notes-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.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 04033a8ba..8d8c23d85 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.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 9bd3a1e74..5490949a3 100644 --- a/routing/routing-api/pom.xml +++ b/routing/routing-api/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -26,7 +26,7 @@ <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-api</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 17d0ccfdf..f744c2eb3 100644 --- a/routing/routing-impl/pom.xml +++ b/routing/routing-impl/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -28,7 +28,7 @@ <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-impl</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/pom.xml b/samples/pom.xml index 44ae255f0..378535b99 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.18.04</version> + <version>1.18.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 58d166247..121ef54f6 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 36664f38c..dc87964c1 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <!-- Api classes generated from yang model --> diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 0245d87bc..e36aadf6f 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/v3po/pom.xml b/v3po/pom.xml index f418614b1..e4f46b6ea 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.v3po</groupId> <artifactId>v3po-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.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 9019c441e..1ce57be48 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 6f528eb77..32c87098f 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index c57548d07..ca1802815 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <!-- Api --> <dependency> <groupId>io.fd.hc2vpp.vpp.classifier</groupId> <artifactId>vpp-classifier-api</artifactId> - <version>1.18.04</version> + <version>1.18.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 230b0bad3..de0394d7c 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.18.04</version> + <version>1.18.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 22d25b37d..9038663c8 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.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 24aae4d89..d90d8b899 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index 769541fad..7f2e87257 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-common-aggregator</artifactId> - <version>1.18.04</version> + <version>1.18.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 0ba07b5e2..fadd50502 100644 --- a/vpp-common/vpp-common-integration/pom.xml +++ b/vpp-common/vpp-common-integration/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> @@ -27,7 +27,7 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-common-integration</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <properties> <jvpp.version>18.04</jvpp.version> diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml index 8dd29b9a4..835c9c35c 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> @@ -27,7 +27,7 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>pom</packaging> <properties> diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml index d97b26096..9f4c902f2 100644 --- a/vpp-common/vpp-translate-test/pom.xml +++ b/vpp-common/vpp-translate-test/pom.xml @@ -20,14 +20,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>vpp-translate-test</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.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 724030b2f..b6a1736b5 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/vpp-integration/api-docs/api/pom.xml b/vpp-integration/api-docs/api/pom.xml index 51955b280..7391cf5bb 100644 --- a/vpp-integration/api-docs/api/pom.xml +++ b/vpp-integration/api-docs/api/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hc2vpp-parent</artifactId> <groupId>io.fd.hc2vpp.common</groupId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -40,6 +40,6 @@ <artifactId>docs-api</artifactId> <name>${project.artifactId}</name> <groupId>io.fd.hc2vpp.docs</groupId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> </project>
\ No newline at end of file diff --git a/vpp-integration/api-docs/core/pom.xml b/vpp-integration/api-docs/core/pom.xml index f57dd2f8c..235be2f81 100644 --- a/vpp-integration/api-docs/core/pom.xml +++ b/vpp-integration/api-docs/core/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hc2vpp-parent</artifactId> <groupId>io.fd.hc2vpp.common</groupId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.docs</groupId> <artifactId>docs-core</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <properties> <mockito-core.version>2.2.9</mockito-core.version> diff --git a/vpp-integration/api-docs/docs/pom.xml b/vpp-integration/api-docs/docs/pom.xml index 25c678f5e..296ec3d46 100644 --- a/vpp-integration/api-docs/docs/pom.xml +++ b/vpp-integration/api-docs/docs/pom.xml @@ -23,7 +23,7 @@ <groupId>io.fd.hc2vpp.docs</groupId> <artifactId>docs</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <properties> <!-- List of modules that are used to extract Writer/Reader factories, and therefore generate api documentation --> diff --git a/vpp-integration/api-docs/pom.xml b/vpp-integration/api-docs/pom.xml index 44b2e801a..e70668532 100644 --- a/vpp-integration/api-docs/pom.xml +++ b/vpp-integration/api-docs/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hc2vpp-parent</artifactId> <groupId>io.fd.hc2vpp.common</groupId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -30,7 +30,7 @@ <artifactId>api-docs</artifactId> <name>${project.artifactId}</name> <packaging>pom</packaging> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <modules> <module>core</module> diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml index 547af5126..19a6caeff 100644 --- a/vpp-integration/api-docs/scripts/pom.xml +++ b/vpp-integration/api-docs/scripts/pom.xml @@ -23,7 +23,7 @@ <groupId>io.fd.hc2vpp.docs</groupId> <artifactId>scripts</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <properties> <groovy.version>2.4.7</groovy.version> diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index 3c0a3f249..d25c47f66 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/minimal-distribution-parent</relativePath> </parent> @@ -27,24 +27,24 @@ <groupId>io.fd.hc2vpp.integration</groupId> <artifactId>vpp-integration-distribution</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <properties> <main.class>io.fd.honeycomb.infra.distro.Main</main.class> - <v3po.version>1.18.04</v3po.version> - <lisp.version>1.18.04</lisp.version> - <vpp.common.integration.version>1.18.04</vpp.common.integration.version> - <vppnsh.version>1.18.04</vppnsh.version> - <nat.version>1.18.04</nat.version> - <ioam.version>1.18.04</ioam.version> - <routing.version>1.18.04</routing.version> - <acl.version>1.18.04</acl.version> - <dhcp.version>1.18.04</dhcp.version> - <vpp.classifier.version>1.18.04</vpp.classifier.version> - <l3-impl.version>1.18.04</l3-impl.version> - <vpp-management-impl.version>1.18.04</vpp-management-impl.version> - <iface.role.version>1.18.04</iface.role.version> - <hc2vpp.bgp.version>1.18.04</hc2vpp.bgp.version> + <v3po.version>1.18.04.1-SNAPSHOT</v3po.version> + <lisp.version>1.18.04.1-SNAPSHOT</lisp.version> + <vpp.common.integration.version>1.18.04.1-SNAPSHOT</vpp.common.integration.version> + <vppnsh.version>1.18.04.1-SNAPSHOT</vppnsh.version> + <nat.version>1.18.04.1-SNAPSHOT</nat.version> + <ioam.version>1.18.04.1-SNAPSHOT</ioam.version> + <routing.version>1.18.04.1-SNAPSHOT</routing.version> + <acl.version>1.18.04.1-SNAPSHOT</acl.version> + <dhcp.version>1.18.04.1-SNAPSHOT</dhcp.version> + <vpp.classifier.version>1.18.04.1-SNAPSHOT</vpp.classifier.version> + <l3-impl.version>1.18.04.1-SNAPSHOT</l3-impl.version> + <vpp-management-impl.version>1.18.04.1-SNAPSHOT</vpp-management-impl.version> + <iface.role.version>1.18.04.1-SNAPSHOT</iface.role.version> + <hc2vpp.bgp.version>1.18.04.1-SNAPSHOT</hc2vpp.bgp.version> <distribution.modules> io.fd.hc2vpp.common.integration.VppCommonModule, diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index b6f2cd489..8718efc83 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.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 472e95c67..09b15a1d4 100644 --- a/vpp-management/api/pom.xml +++ b/vpp-management/api/pom.xml @@ -23,14 +23,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-api</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index 01c2e9d45..611c176bc 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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -30,7 +30,7 @@ <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-impl</artifactId> <name>${project.artifactId}</name> - <version>1.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <dependencies> <!-- Api --> diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index d0a3b7d9c..f3556d68d 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.18.04</version> + <version>1.18.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.18.04</version> + <version>1.18.04.1-SNAPSHOT</version> <description>Aggregator for Hc2vpp vpp-management plugin</description> <modules> diff --git a/vpp-version b/vpp-version index eaacb3a75..fea07c41e 100755 --- a/vpp-version +++ b/vpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo '18.04-release' +echo 'RELEASE' # Determines which VPP version to use in hc2vpp-integration job. # 'RELEASE' will use the latest VPP in the respective branch. |