diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-01-10 11:05:35 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-01-10 11:08:24 +0100 |
| commit | 0c7caef96d2a3bf9e9175a74f096da2e7263225a (patch) | |
| tree | bde2f8714d63f361d747e9fe6b4260f93db52c60 | |
| parent | b13e648949b268a91be59e2b722f6e687342a918 (diff) | |
Set hc2vpp version back to 1.18.01-SNAPSHOT
Also sets honeycomb DEB/RPM package version to 1.18.01-RC2~$BUILD_NUMBER
Change-Id: I7d1916b9e464d957d55b620e746cf763c83943a8
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
74 files changed, 170 insertions, 170 deletions
diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index f377f3ef0..641bd6e55 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index d71d5de98..4a18f7a0d 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <properties> <jvpp.acl.version>18.01-SNAPSHOT</jvpp.acl.version> diff --git a/acl/pom.xml b/acl/pom.xml index e9306f158..51e716043 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>acl-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 aae097a51..15587bdbd 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index c6666a514..4e1e8f0b1 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/bgp/pom.xml b/bgp/pom.xml index 436dedd4a..8afc48634 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.bgp</groupId> <artifactId>bgp-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 e23e0e329..a980a5467 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> <name>${project.artifactId}</name> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>pom</packaging> <build> diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index 739848bcf..33660e458 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.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath/> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> <name>${project.artifactId}</name> - <version>1.18.01-RC1</version> + <version>1.18.01-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 d313bd2c4..2883c92df 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> <name>${project.artifactId}</name> - <version>1.18.01-RC1</version> + <version>1.18.01-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>1.18.01-RC1</version> + <version>1.18.01-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 ab2fd140e..b5e7464c4 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> @@ -129,7 +129,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>common-scripts</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> </dependency> </dependencies> </plugin> @@ -142,7 +142,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-assembly-descriptor</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> </dependency> </dependencies> <executions> diff --git a/common/pom.xml b/common/pom.xml index e4816ee6a..ecada167c 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-common-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 03ef3db85..e84186d0c 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 2b0153dc5..a861de1c2 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> @@ -69,7 +69,7 @@ <dependency> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-impl</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> </dependency> diff --git a/dhcp/pom.xml b/dhcp/pom.xml index 3e69e843f..fc7124ac6 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>dhcp-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 4039d9b23..97a075b00 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index cb7643d38..ea08e4a24 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.iface.role</groupId> <artifactId>impl</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/interface-role/pom.xml b/interface-role/pom.xml index 871eeb4c6..a50253c43 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <name>${project.artifactId}</name> <modules> diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 272b1d148..1eef35e51 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 612a5506f..faffd9fb7 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/ioam/pom.xml b/ioam/pom.xml index fd28f88c4..ce776332b 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.ioam</groupId> <artifactId>vppioam-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 b33f4ce37..65f1e7ec0 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <name>${project.artifactId}</name> <properties> diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index f0fd744c1..3ee9f94c7 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>api-test</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/it/pom.xml b/it/pom.xml index 13bca3f18..0818f1d9e 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.01-RC1</version> + <version>1.18.01-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 f7200e4bf..ce895a1ec 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <dependencies> <dependency> diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index c92b3f3c4..544cd9076 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <dependencies> <dependency> diff --git a/l3/pom.xml b/l3/pom.xml index 4ff42550d..fd73019f3 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <packaging>pom</packaging> diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index 2c134a259..5199d1d7a 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <dependencies> <dependency> diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index 75461515f..3b9992e2f 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <properties> <project.translate.groupId>io.fd.honeycomb</project.translate.groupId> - <naming.context.version>1.18.01-RC1</naming.context.version> + <naming.context.version>1.18.01-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 01fed05ed..d55bebf22 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/lisp/pom.xml b/lisp/pom.xml index 0b7747c5e..ec97cca8e 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 d20040c36..17937837d 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <dependencies> <dependency> diff --git a/mpls/impl/pom.xml b/mpls/impl/pom.xml index fa0e429cd..4005e6368 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/mpls/pom.xml b/mpls/pom.xml index e3631f1a0..52cd9bd85 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.mpls</groupId> <artifactId>mpls-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 0a29a887c..4fc9426ca 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <naming.context.version>1.18.01-RC1</naming.context.version> + <naming.context.version>1.18.01-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 4596475cf..653695d28 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.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat2vpp</artifactId> <name>${project.artifactId}</name> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <honeycomb.infra.version>1.18.01-RC1</honeycomb.infra.version> - <hc2vpp.common.version>1.18.01-RC1</hc2vpp.common.version> + <honeycomb.infra.version>1.18.01-SNAPSHOT</honeycomb.infra.version> + <hc2vpp.common.version>1.18.01-SNAPSHOT</hc2vpp.common.version> </properties> <dependencies> diff --git a/nat/pom.xml b/nat/pom.xml index 56a095420..08e264b01 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 ec616a04e..79638db05 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 743db7297..91b222ee5 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/nsh/pom.xml b/nsh/pom.xml index 2cd247a44..467d838ed 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nsh</groupId> <artifactId>vppnsh-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 6f3c8de62..225ea2cda 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}-RC1-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}-RC1-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}-RC1/ ${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}-RC1/* /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 bb90aad0b..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}-RC1-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}-RC1 +%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}-RC1/* $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 dfc702439..2693fd0a9 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -11,8 +11,8 @@ # Stable versions # # echo RC1~$BUILD_NUMBER -echo RC1 -# echo RC2~$BUILD_NUMBER +# echo RC1 +echo RC2~$BUILD_NUMBER # echo RC2 # # Release snapshot (1.18.01~XXX, 1.18.01.1~XXX, ...) diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index cf76e67b3..8691b68b8 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.18.01-RC1-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.18.01-SNAPSHOT-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ @@ -17,13 +17,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>hc2vpp-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 e39e0f837..91ad40ba8 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>release-notes-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 f7299e4c9..1f56016d1 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 d5039041a..136f37155 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.18.01-RC1</version> + <version>1.18.01-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.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index d0718e205..59fff2a80 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.18.01-RC1</version> + <version>1.18.01-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.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/pom.xml b/samples/pom.xml index 8ba5bcb8c..7541e5075 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.01-RC1</version> + <version>1.18.01-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 bf84a5d7f..4ae01a7c8 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 951b4e2aa..1bb69f4c7 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <dependencies> <!-- Api classes generated from yang model --> diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 5d427e6cc..c1c30acfc 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/v3po/pom.xml b/v3po/pom.xml index 79f590ff7..b08d6fdec 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.v3po</groupId> <artifactId>v3po-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 258f87b9b..b2d7a194f 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 29d86b367..2b0785e4c 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index 9346c24a6..038f28fa3 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <dependencies> <!-- Api --> <dependency> <groupId>io.fd.hc2vpp.vpp.classifier</groupId> <artifactId>vpp-classifier-api</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 6f5fe050a..453a20302 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.01-RC1</version> + <version>1.18.01-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 249edf8d2..dd32a4ca0 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-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 a6fdd0830..4f326c0e6 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index 7914c786b..1d3ac5995 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-common-aggregator</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 f142aa960..e4f6b1f8d 100644 --- a/vpp-common/vpp-common-integration/pom.xml +++ b/vpp-common/vpp-common-integration/pom.xml @@ -19,17 +19,17 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <properties> - <honeycomb.min.distro.version>1.18.01-RC1</honeycomb.min.distro.version> + <honeycomb.min.distro.version>1.18.01-SNAPSHOT</honeycomb.min.distro.version> <jvpp.version>18.01-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 4f870ce3c..ed348ca01 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-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 64ce57eb0..28d9fc86e 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.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>vpp-translate-test</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 2470cc774..a3be8eb07 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-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 0a6a9c82b..66eb75cd6 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -39,6 +39,6 @@ <artifactId>docs-api</artifactId> <groupId>io.fd.hc2vpp.docs</groupId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 0c6e75935..8aa4611ae 100644 --- a/vpp-integration/api-docs/core/pom.xml +++ b/vpp-integration/api-docs/core/pom.xml @@ -21,14 +21,14 @@ <parent> <artifactId>hc2vpp-parent</artifactId> <groupId>io.fd.hc2vpp.common</groupId> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.docs</groupId> <artifactId>docs-core</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <properties> <mockito-core.version>1.10.19</mockito-core.version> diff --git a/vpp-integration/api-docs/docs/pom.xml b/vpp-integration/api-docs/docs/pom.xml index 5e871ef90..5a6888b17 100644 --- a/vpp-integration/api-docs/docs/pom.xml +++ b/vpp-integration/api-docs/docs/pom.xml @@ -22,7 +22,7 @@ <groupId>io.fd.hc2vpp.docs</groupId> <artifactId>docs</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 36b0ee936..a0c884095 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.docs</groupId> <artifactId>api-docs</artifactId> <packaging>pom</packaging> - <version>1.18.01-RC1</version> + <version>1.18.01-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 825cae1bb..3d73af7f0 100644 --- a/vpp-integration/api-docs/scripts/pom.xml +++ b/vpp-integration/api-docs/scripts/pom.xml @@ -22,7 +22,7 @@ <groupId>io.fd.hc2vpp.docs</groupId> <artifactId>scripts</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-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 1b764b6f8..29a3970c0 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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../../common/minimal-distribution-parent</relativePath> </parent> @@ -27,25 +27,25 @@ <groupId>io.fd.hc2vpp.integration</groupId> <artifactId>vpp-integration-distribution</artifactId> <name>${project.artifactId}</name> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <properties> <main.class>io.fd.honeycomb.infra.distro.Main</main.class> - <v3po.version>1.18.01-RC1</v3po.version> - <lisp.version>1.18.01-RC1</lisp.version> - <hc.infra.version>1.18.01-RC1</hc.infra.version> - <vpp.common.integration.version>1.18.01-RC1</vpp.common.integration.version> - <vppnsh.version>1.18.01-RC1</vppnsh.version> - <nat.version>1.18.01-RC1</nat.version> - <ioam.version>1.18.01-RC1</ioam.version> - <routing.version>1.18.01-RC1</routing.version> - <acl.version>1.18.01-RC1</acl.version> - <dhcp.version>1.18.01-RC1</dhcp.version> - <vpp.classifier.version>1.18.01-RC1</vpp.classifier.version> - <l3-impl.version>1.18.01-RC1</l3-impl.version> - <vpp-management-impl.version>1.18.01-RC1</vpp-management-impl.version> - <iface.role.version>1.18.01-RC1</iface.role.version> - <hc2vpp.bgp.version>1.18.01-RC1</hc2vpp.bgp.version> + <v3po.version>1.18.01-SNAPSHOT</v3po.version> + <lisp.version>1.18.01-SNAPSHOT</lisp.version> + <hc.infra.version>1.18.01-SNAPSHOT</hc.infra.version> + <vpp.common.integration.version>1.18.01-SNAPSHOT</vpp.common.integration.version> + <vppnsh.version>1.18.01-SNAPSHOT</vppnsh.version> + <nat.version>1.18.01-SNAPSHOT</nat.version> + <ioam.version>1.18.01-SNAPSHOT</ioam.version> + <routing.version>1.18.01-SNAPSHOT</routing.version> + <acl.version>1.18.01-SNAPSHOT</acl.version> + <dhcp.version>1.18.01-SNAPSHOT</dhcp.version> + <vpp.classifier.version>1.18.01-SNAPSHOT</vpp.classifier.version> + <l3-impl.version>1.18.01-SNAPSHOT</l3-impl.version> + <vpp-management-impl.version>1.18.01-SNAPSHOT</vpp-management-impl.version> + <iface.role.version>1.18.01-SNAPSHOT</iface.role.version> + <hc2vpp.bgp.version>1.18.01-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 f32af4a71..fbd888a09 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-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 094800cef..630e2adcc 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.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-api</artifactId> - <version>1.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> </project>
\ No newline at end of file diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index 98f33f4d2..81ffd7407 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.01-RC1</version> + <version>1.18.01-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.18.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <dependencies> <!-- Api --> diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index 3b95ea767..93c57b0a9 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.01-RC1</version> + <version>1.18.01-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.01-RC1</version> + <version>1.18.01-SNAPSHOT</version> <description>Aggregator for Hc2vpp vpp-management plugin</description> <modules> |