diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2017-10-31 20:32:29 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2017-10-31 20:56:26 +0100 |
| commit | 9543c6f3ac4a4c7e12f51b2816e8d4c743a57b3e (patch) | |
| tree | 97974b3a0bef68b83b3843d7931f8a6938adc63a | |
| parent | 7758b80f96ce03b475c94be49b259bf0a2dd40dd (diff) | |
Set hc2vpp version to 1.17.10.1-SNAPSHOT
Change-Id: Ic1cca03f4375df306dca3bfe946cc2287a4ac44e
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
72 files changed, 166 insertions, 166 deletions
diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 849d7f298..89208aa9e 100644 --- a/acl/acl-api/pom.xml +++ b/acl/acl-api/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -24,7 +24,7 @@ <groupId>io.fd.hc2vpp.acl</groupId> <artifactId>acl-api</artifactId> <name>acl-api</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 6ad10e9f3..66b432d5b 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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.acl</groupId> <artifactId>acl-impl</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <properties> <jvpp.acl.version>17.10</jvpp.acl.version> diff --git a/acl/pom.xml b/acl/pom.xml index 5611678ec..2a4574a56 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -19,11 +19,11 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>acl-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <name>acl-aggregator</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml index 9ec5b1c29..06868f7e8 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.17.10</version> + <version>1.17.10.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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/bgp/pom.xml b/bgp/pom.xml index db97c3e34..b41dc0edd 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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.bgp</groupId> <artifactId>bgp-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 de5da2d6c..be1592609 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>pom</packaging> <build> diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index 27a99d7cc..083b4e4de 100644 --- a/common/hc2vpp-parent/pom.xml +++ b/common/hc2vpp-parent/pom.xml @@ -7,13 +7,13 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>honeycomb-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>pom</packaging> </project>
\ No newline at end of file diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index 094dffa62..e223159b2 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>pom</packaging> <!-- import dependencies from honeycomb impl-parent --> @@ -23,7 +23,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 6730a78cb..66df9d423 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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> @@ -29,7 +29,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> </dependency> </dependencies> </plugin> @@ -142,7 +142,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-assembly-descriptor</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> </dependency> </dependencies> <executions> diff --git a/common/pom.xml b/common/pom.xml index f508e6c00..8296fd11e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -7,14 +7,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-common-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 a7f2774a3..2be81afb3 100644 --- a/dhcp/dhcp-api/pom.xml +++ b/dhcp/dhcp-api/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -24,7 +24,7 @@ <groupId>io.fd.hc2vpp.dhcp</groupId> <artifactId>dhcp-api</artifactId> <name>dhcp-api</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index 3c43627de..9ef739ba6 100644 --- a/dhcp/dhcp-impl/pom.xml +++ b/dhcp/dhcp-impl/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -24,7 +24,7 @@ <groupId>io.fd.hc2vpp.dhcp</groupId> <artifactId>dhcp-impl</artifactId> <name>dhcp-impl</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> @@ -69,7 +69,7 @@ <dependency> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-impl</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> </dependency> diff --git a/dhcp/pom.xml b/dhcp/pom.xml index 9e934cd5e..41203445c 100644 --- a/dhcp/pom.xml +++ b/dhcp/pom.xml @@ -19,11 +19,11 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>dhcp-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <name>dhcp-aggregator</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/interface-role/api/pom.xml b/interface-role/api/pom.xml index 3424c1640..fbcddef14 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.17.10</version> + <version>1.17.10.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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index c543cad04..9ce7500ec 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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.iface.role</groupId> <artifactId>impl</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/interface-role/pom.xml b/interface-role/pom.xml index 885c3a6a3..277928c9c 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.17.10</version> + <version>1.17.10.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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <name>${project.artifactId}</name> <modules> diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 97a9260a6..63e896d3b 100644 --- a/ioam/api/pom.xml +++ b/ioam/api/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -26,7 +26,7 @@ <groupId>io.fd.hc2vpp.ioam</groupId> <artifactId>vppioam-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index a9544128b..4f431210f 100644 --- a/ioam/impl/pom.xml +++ b/ioam/impl/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/ioam/pom.xml b/ioam/pom.xml index c3e392d51..78ae21d93 100644 --- a/ioam/pom.xml +++ b/ioam/pom.xml @@ -18,13 +18,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.ioam</groupId> <artifactId>vppioam-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 64f4165db..afb8911d5 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.17.10</version> + <version>1.17.10.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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <name>${project.artifactId}</name> <properties> diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index a9c12d457..3c29cec02 100644 --- a/it/api-test/pom.xml +++ b/it/api-test/pom.xml @@ -21,13 +21,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>api-test</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <name>${project.artifactId}</name> <dependencies> diff --git a/it/pom.xml b/it/pom.xml index f4199c308..7b9a317cd 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/l3/api/pom.xml b/l3/api/pom.xml index 466509a8b..695f08ec9 100644 --- a/l3/api/pom.xml +++ b/l3/api/pom.xml @@ -22,14 +22,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.l3</groupId> <artifactId>l3-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 6d7913c51..74f8af11b 100644 --- a/l3/impl/pom.xml +++ b/l3/impl/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.l3</groupId> <artifactId>l3-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/l3/pom.xml b/l3/pom.xml index 64b08395c..9856ea5c6 100644 --- a/l3/pom.xml +++ b/l3/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hc2vpp-parent</artifactId> <groupId>io.fd.hc2vpp.common</groupId> - <version>1.17.10</version> + <version>1.17.10.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 1162a2749..7cefcad2e 100644 --- a/l3/utils/pom.xml +++ b/l3/utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.l3</groupId> <artifactId>l3-utils</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <dependencies> <dependency> diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index ec484eb07..9aa779a6a 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -26,12 +26,12 @@ <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> <project.translate.groupId>io.fd.honeycomb</project.translate.groupId> - <naming.context.version>1.17.10</naming.context.version> + <naming.context.version>1.17.10.1-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 33dc99d44..b8c9ac3f0 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -27,7 +27,7 @@ <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp2vpp</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/lisp/pom.xml b/lisp/pom.xml index 38cf40135..6ffb7df8a 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -19,13 +19,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 c4852718c..2db996401 100644 --- a/nat/nat-api/pom.xml +++ b/nat/nat-api/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -25,11 +25,11 @@ <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <naming.context.version>1.17.10</naming.context.version> + <naming.context.version>1.17.10.1-SNAPSHOT</naming.context.version> </properties> <dependencies> diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index d58ea6e8f..3bed8e157 100644 --- a/nat/nat2vpp/pom.xml +++ b/nat/nat2vpp/pom.xml @@ -18,19 +18,19 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat2vpp</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <honeycomb.infra.version>1.17.10</honeycomb.infra.version> - <hc2vpp.common.version>1.17.10</hc2vpp.common.version> + <honeycomb.infra.version>1.17.10.1-SNAPSHOT</honeycomb.infra.version> + <hc2vpp.common.version>1.17.10.1-SNAPSHOT</hc2vpp.common.version> </properties> <dependencies> diff --git a/nat/pom.xml b/nat/pom.xml index f9b24e79f..da0a2c2c3 100644 --- a/nat/pom.xml +++ b/nat/pom.xml @@ -18,13 +18,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 62a7a9d9e..fa422448f 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -26,7 +26,7 @@ <groupId>io.fd.hc2vpp.nsh</groupId> <artifactId>vppnsh-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index adacda177..fb66282b5 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> @@ -25,7 +25,7 @@ <groupId>io.fd.hc2vpp.nsh</groupId> <artifactId>vppnsh-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/nsh/pom.xml b/nsh/pom.xml index 96a734d14..c9248422d 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -18,13 +18,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nsh</groupId> <artifactId>vppnsh-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 bc8ef4132..9f85f0e0b 100755 --- a/packaging/deb/common/prepare.sh +++ b/packaging/deb/common/prepare.sh @@ -14,9 +14,9 @@ BUILD_DEPENDENCIES=$($5) # Copy and unpack the archive with vpp-integration distribution ARCHIVE_DIR=${SOURCE_DIR}/../../../vpp-integration/minimal-distribution/target/ -ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz cp ${ARCHIVE} ${SOURCE_DIR} -ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-hc.tar.gz +ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/ # Create packaging root @@ -24,7 +24,7 @@ rm -rf ${BUILD_DIR} mkdir ${BUILD_DIR} # Copy contents of tar.gz -mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}/ ${BUILD_DIR}/ +mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${BUILD_DIR}/ cp -r $2 ${BUILD_DIR} # OS service definition @@ -34,14 +34,14 @@ cp ${SOURCE_DIR}/$3 ${BUILD_DIR} cat <<EOT >> ${BUILD_DIR}/debian/changelog honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low - * 17.10 release + * 17.10.1 release -- mgradzki <mgradzki@cisco.com> Mon, 23 Feb 2016 09:41:37 +0200 EOT # Install instructions cat <<EOT >> ${BUILD_DIR}/debian/install -vpp-integration-distribution-${VERSION}/* /opt/honeycomb/ +vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/ $3 $4 EOT diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index d759d8bb7..3c4e7efde 100644 --- a/packaging/rpm/honeycomb.spec +++ b/packaging/rpm/honeycomb.spec @@ -17,7 +17,7 @@ Summary: fd.io Honeycomb Group: Applications/Communications License: Apache-1.0 URL: http://www.fd.io -Source0: vpp-integration-distribution-%{_version}-hc.zip +Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip Source1: honeycomb.service Requires: %{_vpp_dependencies}, java >= 1:1.8.0 # Required for creating honeycomb group @@ -38,13 +38,13 @@ fd.io Honeycomb %prep # Extract Source0 (Honeycomb archive) -%autosetup -n vpp-integration-distribution-%{_version} +%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT %install # Create directory in build root for Honeycomb mkdir -p $RPM_BUILD_ROOT/opt/%name # Copy Honeycomb from archive to its dir in build root -cp -r ../vpp-integration-distribution-%{_version}/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name # Create directory in build root for systemd .service file mkdir -p $RPM_BUILD_ROOT/%{_unitdir} # Copy Honeycomb's systemd .service file to correct dir in build root diff --git a/packaging/rpm/release b/packaging/rpm/release index 3ec80eac1..c5672830e 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,13 +1,13 @@ #!/bin/bash # release version -echo RELEASE +# echo RELEASE # # snapshot version # # Increasing the build number by a certain margin. # Necessary due to honeycomb - hc2vpp split. Build_number counter was reset # rewriting older packages -# echo $(expr $BUILD_NUMBER + 2000) +# $(expr $BUILD_NUMBER + 2000) # echo RC1~$(expr $BUILD_NUMBER + 2000) # echo RC2~$(expr $BUILD_NUMBER + 2000) -# echo RELEASE~$(expr $BUILD_NUMBER + 2000)
\ No newline at end of file +echo RELEASE~$(expr $BUILD_NUMBER + 2000)
\ No newline at end of file diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index 583b8a429..b98e81dcf 100755 --- a/packaging/rpm/rpmbuild.sh +++ b/packaging/rpm/rpmbuild.sh @@ -3,7 +3,7 @@ set -xe DIR=$(dirname $0) DIR=$(readlink -f $DIR) ZIPDIR=${DIR}/../../vpp-integration/minimal-distribution/target/ -ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.10-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.10.1-SNAPSHOT-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ diff --git a/packaging/rpm/version b/packaging/rpm/version index 98c4fc6ac..2f2d44db2 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.17.10 +echo 1.17.10.1 @@ -17,13 +17,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>hc2vpp-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 aed0bfecd..f80f12f8f 100644 --- a/release-notes/pom.xml +++ b/release-notes/pom.xml @@ -19,13 +19,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>release-notes-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/routing/pom.xml b/routing/pom.xml index 5b4eeff66..cb5b7f43f 100644 --- a/routing/pom.xml +++ b/routing/pom.xml @@ -19,13 +19,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 aa88bd3fc..c317edcde 100644 --- a/routing/routing-api/pom.xml +++ b/routing/routing-api/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-api</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 0c67f849f..1cd86aa76 100644 --- a/routing/routing-impl/pom.xml +++ b/routing/routing-impl/pom.xml @@ -20,14 +20,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-impl</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/pom.xml b/samples/pom.xml index 835bae582..a63ef08de 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>hc2vpp-parent</artifactId> <groupId>io.fd.hc2vpp.common</groupId> - <version>1.17.10</version> + <version>1.17.10.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 9be9b2262..699ec9c81 100644 --- a/samples/samples-api/pom.xml +++ b/samples/samples-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -13,7 +13,7 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>samples-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index a919a7a53..ce987f0c3 100644 --- a/samples/samples-impl/pom.xml +++ b/samples/samples-impl/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>samples-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <dependencies> <!-- Api classes generated from yang model --> diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index a9684b07d..0425d9d2e 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -25,7 +25,7 @@ <groupId>io.fd.hc2vpp.v3po</groupId> <artifactId>v3po-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/v3po/pom.xml b/v3po/pom.xml index 536ff9224..0480d6318 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -18,13 +18,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.v3po</groupId> <artifactId>v3po-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 85f2b2c32..f6babb4be 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -27,7 +27,7 @@ <groupId>io.fd.hc2vpp.v3po</groupId> <artifactId>v3po2vpp</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 71e5808f4..56c22eaed 100644 --- a/vpp-classifier/api/pom.xml +++ b/vpp-classifier/api/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.vpp.classifier</groupId> <artifactId>vpp-classifier-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index 5dfc71dc9..8efed4b23 100644 --- a/vpp-classifier/impl/pom.xml +++ b/vpp-classifier/impl/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -30,14 +30,14 @@ <groupId>io.fd.hc2vpp.vpp.classifier</groupId> <artifactId>vpp-classifier-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <dependencies> <!-- Api --> <dependency> <groupId>io.fd.hc2vpp.vpp.classifier</groupId> <artifactId>vpp-classifier-api</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 826e44dd3..8df794cfc 100644 --- a/vpp-classifier/pom.xml +++ b/vpp-classifier/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 dfcfabc76..1638b568b 100644 --- a/vpp-common/naming-context-api/pom.xml +++ b/vpp-common/naming-context-api/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> @@ -26,7 +26,7 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>naming-context-api</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.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 51f8ff127..1d65a8661 100644 --- a/vpp-common/naming-context-impl/pom.xml +++ b/vpp-common/naming-context-impl/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> @@ -27,7 +27,7 @@ <groupId>io.fd.hc2vpp.common</groupId> <artifactId>naming-context-impl</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index a977cd86e..4b6770af1 100644 --- a/vpp-common/pom.xml +++ b/vpp-common/pom.xml @@ -18,13 +18,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-common-aggregator</artifactId> - <version>1.17.10</version> + <version>1.17.10.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 fb84b7cdf..1bbb63f5a 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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-common-integration</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <properties> - <honeycomb.min.distro.version>1.17.10</honeycomb.min.distro.version> + <honeycomb.min.distro.version>1.17.10.1-SNAPSHOT</honeycomb.min.distro.version> <jvpp.version>17.10</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 3f37a60fa..10a730ac5 100644 --- a/vpp-common/vpp-impl-parent/pom.xml +++ b/vpp-common/vpp-impl-parent/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.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.17.10</version> + <version>1.17.10.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 0abf36106..d01787a79 100644 --- a/vpp-common/vpp-translate-test/pom.xml +++ b/vpp-common/vpp-translate-test/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>vpp-translate-test</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml index aeedbb6ec..7c5394b96 100644 --- a/vpp-common/vpp-translate-utils/pom.xml +++ b/vpp-common/vpp-translate-utils/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>vpp-translate-utils</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.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 8d1b3600a..de684822b 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.17.10</version> + <version>1.17.10.1-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.17.10</version> + <version>1.17.10.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 97fc4440b..d41205b73 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.17.10</version> + <version>1.17.10.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.17.10</version> + <version>1.17.10.1-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 1d32ac1b0..6ebf9b73d 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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <properties> <!-- List of modules that are used to extract Writer/Reader factories, and therefore generate api documentation --> diff --git a/vpp-integration/api-docs/pom.xml b/vpp-integration/api-docs/pom.xml index 2d49859e5..73f1611e7 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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.docs</groupId> <artifactId>api-docs</artifactId> <packaging>pom</packaging> - <version>1.17.10</version> + <version>1.17.10.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 4d1804bdc..672eb970c 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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <properties> <groovy.version>2.4.7</groovy.version> diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index e3abf3e91..3b1d793ef 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-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.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <properties> <main.class>io.fd.honeycomb.infra.distro.Main</main.class> - <v3po.version>1.17.10</v3po.version> - <lisp.version>1.17.10</lisp.version> - <hc.infra.version>1.17.10</hc.infra.version> - <vpp.common.integration.version>1.17.10</vpp.common.integration.version> - <vppnsh.version>1.17.10</vppnsh.version> - <nat.version>1.17.10</nat.version> - <ioam.version>1.17.10</ioam.version> - <routing.version>1.17.10</routing.version> - <acl.version>1.17.10</acl.version> - <dhcp.version>1.17.10</dhcp.version> - <vpp.classifier.version>1.17.10</vpp.classifier.version> - <l3-impl.version>1.17.10</l3-impl.version> - <vpp-management-impl.version>1.17.10</vpp-management-impl.version> - <iface.role.version>1.17.10</iface.role.version> - <hc2vpp.bgp.version>1.17.10</hc2vpp.bgp.version> + <v3po.version>1.17.10.1-SNAPSHOT</v3po.version> + <lisp.version>1.17.10.1-SNAPSHOT</lisp.version> + <hc.infra.version>1.17.10.1-SNAPSHOT</hc.infra.version> + <vpp.common.integration.version>1.17.10.1-SNAPSHOT</vpp.common.integration.version> + <vppnsh.version>1.17.10.1-SNAPSHOT</vppnsh.version> + <nat.version>1.17.10.1-SNAPSHOT</nat.version> + <ioam.version>1.17.10.1-SNAPSHOT</ioam.version> + <routing.version>1.17.10.1-SNAPSHOT</routing.version> + <acl.version>1.17.10.1-SNAPSHOT</acl.version> + <dhcp.version>1.17.10.1-SNAPSHOT</dhcp.version> + <vpp.classifier.version>1.17.10.1-SNAPSHOT</vpp.classifier.version> + <l3-impl.version>1.17.10.1-SNAPSHOT</l3-impl.version> + <vpp-management-impl.version>1.17.10.1-SNAPSHOT</vpp-management-impl.version> + <iface.role.version>1.17.10.1-SNAPSHOT</iface.role.version> + <hc2vpp.bgp.version>1.17.10.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 8e78a48c5..d2e58a3f2 100644 --- a/vpp-integration/pom.xml +++ b/vpp-integration/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.integration</groupId> <artifactId>vpp-integration</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.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 c1fdc11e6..86dacd766 100644 --- a/vpp-management/api/pom.xml +++ b/vpp-management/api/pom.xml @@ -23,11 +23,11 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-api</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> </project>
\ No newline at end of file diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index 7950bfc10..f080347c4 100644 --- a/vpp-management/impl/pom.xml +++ b/vpp-management/impl/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-impl-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../../vpp-common/vpp-impl-parent</relativePath> </parent> @@ -29,7 +29,7 @@ <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-impl</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <dependencies> <!-- Api --> diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index 70aedacf9..1ac61fa49 100644 --- a/vpp-management/pom.xml +++ b/vpp-management/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> @@ -31,7 +31,7 @@ <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-aggregator</artifactId> <name>${project.artifactId}</name> - <version>1.17.10</version> + <version>1.17.10.1-SNAPSHOT</version> <description>Aggregator for Hc2vpp vpp-management plugin</description> <modules> diff --git a/vpp-version b/vpp-version index 30531913d..fea07c41e 100755 --- a/vpp-version +++ b/vpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo '17.10-release' +echo 'RELEASE' # Determines which VPP version to use in hc2vpp-integration job. # 'RELEASE' will use the latest VPP in the respective branch. |