diff options
| author |   Michal Cmarada <mcmarada@cisco.com> | 2019-05-07 15:21:20 +0200 |
|---|---|---|
| committer | Michal Cmarada <mcmarada@cisco.com> | 2019-05-07 15:21:20 +0200 |
| commit | a5ed73b7ffa04b50474c9ff778a8e3914dc462c5 (patch) | |
| tree | b81159887810d78ea7cce560f017c40997be5671 | |
| parent | 2ba3eeeecab667397b1996ec2f2cbd6081ec4df6 (diff) | |
Set Hc2vpp version to 1.19.04.1-SNAPSHOTstable/1904
Change-Id: I4d30b1b6ff4a6ef341e0a73f1e9598ba5271ed20
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
86 files changed, 187 insertions, 187 deletions
diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 2f04b253e..f7a2d608f 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 7f9c681d1..b638b7262 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <properties> <jvpp.acl.version>19.04</jvpp.acl.version> diff --git a/acl/pom.xml b/acl/pom.xml index 0866b203b..5c3955f20 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>acl-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 5a2e31ea8..54158f3b7 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index fba4c5432..81ddc59c8 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/bgp/pom.xml b/bgp/pom.xml index 459f37bb9..a27df8816 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.bgp</groupId> <artifactId>bgp-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 4da116431..bd1d1cec5 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>pom</packaging> <properties> diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index a43578d89..b76ca67d4 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> <name>${project.artifactId}</name> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>pom</packaging> <properties> - <honeycomb.version>1.19.04</honeycomb.version> + <honeycomb.version>1.19.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 80a3f5270..a8bf7a4d5 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.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 6d6d40a23..853965ca6 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> diff --git a/common/pom.xml b/common/pom.xml index 0c7050288..d628b9976 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-common-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 1fcf65c40..519259edb 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 222854aab..29d030bdb 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> @@ -67,7 +67,7 @@ <dependency> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-impl</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> </dependency> diff --git a/dhcp/pom.xml b/dhcp/pom.xml index ae94b3130..daa90ec26 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>dhcp-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>dhcp-aggregator</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/fib-management/fib-management-api/pom.xml b/fib-management/fib-management-api/pom.xml index f7d174cb2..577fb30ba 100644 --- a/fib-management/fib-management-api/pom.xml +++ b/fib-management/fib-management-api/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.fib.management</groupId> <artifactId>fib-management-api</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>bundle</packaging> </project> diff --git a/fib-management/fib-management-impl/pom.xml b/fib-management/fib-management-impl/pom.xml index 1a2410e23..9b9031dc7 100644 --- a/fib-management/fib-management-impl/pom.xml +++ b/fib-management/fib-management-impl/pom.xml @@ -20,14 +20,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.fib.management</groupId> <artifactId>fib-management-impl</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>bundle</packaging> diff --git a/fib-management/pom.xml b/fib-management/pom.xml index 659340c70..06f8e6557 100644 --- a/fib-management/pom.xml +++ b/fib-management/pom.xml @@ -19,13 +19,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>fib-management-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/interface-role/api/pom.xml b/interface-role/api/pom.xml index a0c326772..48da4134c 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index 846362ce1..006428715 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.iface.role</groupId> <artifactId>impl</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/interface-role/pom.xml b/interface-role/pom.xml index da3ee60df..c9a425a2f 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <modules> diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 21fb59422..c6de6ea2d 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 9b4d8c102..3151ea169 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/ioam/pom.xml b/ioam/pom.xml index 27cf4d3f3..9a2175c38 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.ioam</groupId> <artifactId>vppioam-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/ipsec/ipsec-api/pom.xml b/ipsec/ipsec-api/pom.xml index d290540c5..50ee24f86 100644 --- a/ipsec/ipsec-api/pom.xml +++ b/ipsec/ipsec-api/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -27,11 +27,11 @@ <groupId>io.fd.hc2vpp.ipsec</groupId> <artifactId>ipsec-api</artifactId> <name>${project.artifactId}</name> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <naming.context.version>1.19.04</naming.context.version> + <naming.context.version>1.19.04.1-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/ipsec/ipsec-impl/pom.xml b/ipsec/ipsec-impl/pom.xml index 0b46f73e6..93529756a 100644 --- a/ipsec/ipsec-impl/pom.xml +++ b/ipsec/ipsec-impl/pom.xml @@ -20,14 +20,14 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.ipsec</groupId> <artifactId>ipsec-impl</artifactId> <name>${project.artifactId}</name> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/ipsec/pom.xml b/ipsec/pom.xml index 47c511ff9..ec13ec975 100644 --- a/ipsec/pom.xml +++ b/ipsec/pom.xml @@ -19,13 +19,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.ipsec</groupId> <artifactId>ipsec-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 ba4257c36..5fda62e93 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <properties> diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index 04bd6f3f0..fbc152e3b 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>api-test</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/it/jvpp-benchmark/pom.xml b/it/jvpp-benchmark/pom.xml index afbd530d4..5851dea84 100644 --- a/it/jvpp-benchmark/pom.xml +++ b/it/jvpp-benchmark/pom.xml @@ -21,14 +21,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.it</groupId> <artifactId>jvpp-benchmark</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <properties> diff --git a/it/pom.xml b/it/pom.xml index 0a5dff7f5..1d8265fcc 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jvpp-version b/jvpp-version index 278d5d218..7dfd4b314 100755 --- a/jvpp-version +++ b/jvpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo '19.04-release' +echo 'RELEASE' # Determines which JVPP version to use in hc2vpp-integration job. # 'RELEASE' will use the latest JVPP in the respective branch. diff --git a/l3/api/pom.xml b/l3/api/pom.xml index 8f0f87051..5d8022215 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 846ba40c2..127753afd 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/l3/pom.xml b/l3/pom.xml index 8c94aabf4..473938f2d 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.19.04</version> + <version>1.19.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 3c0cf50fb..ac0daed09 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index a59ad7ad6..488de2744 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -26,11 +26,11 @@ <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp-api</artifactId> <name>${project.artifactId}</name> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <naming.context.version>1.19.04</naming.context.version> + <naming.context.version>1.19.04.1-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 0972bdb71..238e75715 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/lisp/pom.xml b/lisp/pom.xml index 34b6bd598..91f1673a5 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 674b9be7e..65365adcb 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/mpls/impl/pom.xml b/mpls/impl/pom.xml index eafa8d606..2d8324ae5 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/mpls/pom.xml b/mpls/pom.xml index cc2eae6a3..cde7aa95d 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.mpls</groupId> <artifactId>mpls-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 7ce6432ae..d86308ec1 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <naming.context.version>1.19.04</naming.context.version> + <naming.context.version>1.19.04.1-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index ce895910e..480379650 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <hc2vpp.common.version>1.19.04</hc2vpp.common.version> + <hc2vpp.common.version>1.19.04.1-SNAPSHOT</hc2vpp.common.version> </properties> <dependencies> diff --git a/nat/pom.xml b/nat/pom.xml index 9706a6390..f86f8a864 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 7463baafd..a3078a16e 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 687eb9896..dc78cfd9d 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/nsh/pom.xml b/nsh/pom.xml index df608c875..48e18a043 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nsh</groupId> <artifactId>vppnsh-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 3a511f708..0f12d28f6 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 - * 19.04 release + * 19.04.1 release -- mcmarada <mcmarada@cisco.com> Thu, 18 Oct 2018 13:42:07 +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 9f2e56d9b..2c33de070 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -17,8 +17,8 @@ # echo RC3~$BUILD_NUMBER # echo RC3 # -# Release snapshot (1.19.04~XXX, 1.19.04.1~XXX, ...) -# echo RELEASE~$BUILD_NUMBER +# Release snapshot (1.19.04.1-SNAPSHOT~XXX, 1.19.04.1-SNAPSHOT.1~XXX, ...) +echo RELEASE~$BUILD_NUMBER # -# Release version (1.19.04, 1.19.04.1, ...) -echo RELEASE
\ No newline at end of file +# Release version (1.19.04.1-SNAPSHOT, 1.19.04.1-SNAPSHOT.1, ...) +# echo RELEASE
\ No newline at end of file diff --git a/packaging/rpm/version b/packaging/rpm/version index df76e1bcb..86b10feb7 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.19.04 +echo 1.19.04.1 @@ -17,13 +17,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>hc2vpp-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 104490dcc..5679effe1 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>release-notes-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> @@ -107,7 +107,7 @@ making it much easier when bumping versions --> <project-version>${project.version}</project-version> <project-public-version>19.04</project-public-version> - <project-config-version>1-19-04</project-config-version> + <project-config-version>1.19.04.1-SNAPSHOT</project-config-version> <project-version-in-jira>11701</project-version-in-jira> <project-branch>stable/1904</project-branch> <project-odl-version>oxygen</project-odl-version> diff --git a/routing/pom.xml b/routing/pom.xml index ad28a1bd9..3f49f18bf 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 3692ea47e..d492f507f 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-api</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>bundle</packaging> diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 165d6edfc..521f0f270 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-impl</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>bundle</packaging> diff --git a/samples/pom.xml b/samples/pom.xml index 8b262728f..052000007 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.19.04</version> + <version>1.19.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 82eff4d1d..41f6a6f8b 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 8b3430f98..965994066 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <dependencies> <!-- Api classes generated from yang model --> diff --git a/srv6/pom.xml b/srv6/pom.xml index 268d0a6e3..2fd107d24 100644 --- a/srv6/pom.xml +++ b/srv6/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.srv6</groupId> <artifactId>srv6-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/srv6/srv6-api/pom.xml b/srv6/srv6-api/pom.xml index 083416ac6..4bba213c7 100644 --- a/srv6/srv6-api/pom.xml +++ b/srv6/srv6-api/pom.xml @@ -21,14 +21,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.srv6</groupId> <artifactId>srv6-api</artifactId> <name>${project.artifactId}</name> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/srv6/srv6-impl/pom.xml b/srv6/srv6-impl/pom.xml index 83f65b586..2d13a1651 100644 --- a/srv6/srv6-impl/pom.xml +++ b/srv6/srv6-impl/pom.xml @@ -21,14 +21,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.srv6</groupId> <artifactId>srv6-impl</artifactId> <name>${project.artifactId}</name> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 82aa719a8..f541e964e 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/v3po/pom.xml b/v3po/pom.xml index d5dd9d95d..86300e70e 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.v3po</groupId> <artifactId>v3po-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 657fa9239..a109fcf1e 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 34cafb3f6..424c48ce2 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index d6d67afbf..1f140997b 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <dependencies> <!-- Api --> <dependency> <groupId>io.fd.hc2vpp.vpp.classifier</groupId> <artifactId>vpp-classifier-api</artifactId> - <version>1.19.04</version> + <version>1.19.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 6b53de066..a5979237f 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.19.04</version> + <version>1.19.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 434bf726f..74638677e 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.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 b12a8ea6c..dd8c524ea 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index 45bc325af..9fe0d9e8d 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-common-aggregator</artifactId> - <version>1.19.04</version> + <version>1.19.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 7ac385b57..20342b0cb 100644 --- a/vpp-common/vpp-common-integration/pom.xml +++ b/vpp-common/vpp-common-integration/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-common-integration</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <properties> diff --git a/vpp-common/vpp-impl-parent/pom.xml b/vpp-common/vpp-impl-parent/pom.xml index cfe3bbbf4..1234de2d6 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.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 bbf63c626..0693d0838 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>vpp-translate-test</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>bundle</packaging> diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml index 2b8d9f7f1..a9b3cfb98 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.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 9ab2b0572..c852c51d1 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.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 69e0d68cb..3083a70b4 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.19.04</version> + <version>1.19.04.1-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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <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 55bf6cfda..94a280879 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <properties> diff --git a/vpp-integration/api-docs/pom.xml b/vpp-integration/api-docs/pom.xml index a599eb846..e8e2330d6 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.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 587a57169..6788632e7 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <properties> diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index 89b6e4ef0..64d6a9a3c 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <properties> <main.class>io.fd.honeycomb.infra.distro.Main</main.class> - <v3po.version>1.19.04</v3po.version> - <lisp.version>1.19.04</lisp.version> - <vpp.common.integration.version>1.19.04</vpp.common.integration.version> - <vppnsh.version>1.19.04</vppnsh.version> - <nat.version>1.19.04</nat.version> - <ioam.version>1.19.04</ioam.version> - <routing.version>1.19.04</routing.version> - <acl.version>1.19.04</acl.version> - <dhcp.version>1.19.04</dhcp.version> - <vpp.classifier.version>1.19.04</vpp.classifier.version> - <l3-impl.version>1.19.04</l3-impl.version> - <vpp-management-impl.version>1.19.04</vpp-management-impl.version> - <iface.role.version>1.19.04</iface.role.version> - <hc2vpp.bgp.version>1.19.04</hc2vpp.bgp.version> + <v3po.version>1.19.04.1-SNAPSHOT</v3po.version> + <lisp.version>1.19.04.1-SNAPSHOT</lisp.version> + <vpp.common.integration.version>1.19.04.1-SNAPSHOT</vpp.common.integration.version> + <vppnsh.version>1.19.04.1-SNAPSHOT</vppnsh.version> + <nat.version>1.19.04.1-SNAPSHOT</nat.version> + <ioam.version>1.19.04.1-SNAPSHOT</ioam.version> + <routing.version>1.19.04.1-SNAPSHOT</routing.version> + <acl.version>1.19.04.1-SNAPSHOT</acl.version> + <dhcp.version>1.19.04.1-SNAPSHOT</dhcp.version> + <vpp.classifier.version>1.19.04.1-SNAPSHOT</vpp.classifier.version> + <l3-impl.version>1.19.04.1-SNAPSHOT</l3-impl.version> + <vpp-management-impl.version>1.19.04.1-SNAPSHOT</vpp-management-impl.version> + <iface.role.version>1.19.04.1-SNAPSHOT</iface.role.version> + <hc2vpp.bgp.version>1.19.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 e17cda4da..9638549ee 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.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 3f43ec75b..d007c8b38 100644 --- a/vpp-management/api/pom.xml +++ b/vpp-management/api/pom.xml @@ -23,13 +23,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-api</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index 3485b6f70..9ccbd643a 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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-impl</artifactId> - <version>1.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index 11875fbfd..3c300f67b 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.19.04</version> + <version>1.19.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.19.04</version> + <version>1.19.04.1-SNAPSHOT</version> <description>Aggregator for Hc2vpp vpp-management plugin</description> <modules> diff --git a/vpp-version b/vpp-version index 819c9a38e..fea07c41e 100755 --- a/vpp-version +++ b/vpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo '19.04-release' +echo 'RELEASE' # Determines which VPP version to use in hc2vpp-integration job. # 'RELEASE' will use the latest VPP in the respective branch. |