diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2017-10-30 15:13:37 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2017-10-31 14:35:02 +0100 |
| commit | 7758b80f96ce03b475c94be49b259bf0a2dd40dd (patch) | |
| tree | 53d607e3937d8f507ae449f93c24488c65e06853 | |
| parent | 4ab125c86db6885c1e9c37f19b6a2b483e9c8c63 (diff) | |
Bump Hc2vpp version to 1.17.10v1.17.10
Also updates honeycomb dependencies.
Change-Id: I2f04e80f2c1da3d9ac82425f517e8fd3d5cd4213
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
71 files changed, 164 insertions, 164 deletions
diff --git a/acl/acl-api/pom.xml b/acl/acl-api/pom.xml index 56e3abe86..849d7f298 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/acl/acl-impl/pom.xml b/acl/acl-impl/pom.xml index 14df33901..6ad10e9f3 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <properties> <jvpp.acl.version>17.10</jvpp.acl.version> diff --git a/acl/pom.xml b/acl/pom.xml index 0667bf116..5611678ec 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>acl-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 c2ab06b66..9ec5b1c29 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <dependencies> <!-- Honeycomb infrastructure --> diff --git a/bgp/pom.xml b/bgp/pom.xml index 27519b086..db97c3e34 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.bgp</groupId> <artifactId>bgp-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 1490659f2..de5da2d6c 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>api-parent</artifactId> <name>${project.artifactId}</name> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</version> <packaging>pom</packaging> <build> diff --git a/common/hc2vpp-parent/pom.xml b/common/hc2vpp-parent/pom.xml index b6b9e1cc6..27a99d7cc 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath/> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> <name>${project.artifactId}</name> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 e40bebd61..094dffa62 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>impl-parent</artifactId> <name>${project.artifactId}</name> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</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 f9ba54ad3..6730a78cb 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> </dependency> </dependencies> </plugin> @@ -142,7 +142,7 @@ <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-assembly-descriptor</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</version> </dependency> </dependencies> <executions> diff --git a/common/pom.xml b/common/pom.xml index 384c4c117..f508e6c00 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-common-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 31758b20d..a7f2774a3 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/dhcp/dhcp-impl/pom.xml b/dhcp/dhcp-impl/pom.xml index f2af59f1f..3c43627de 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> @@ -69,7 +69,7 @@ <dependency> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-impl</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</version> </dependency> diff --git a/dhcp/pom.xml b/dhcp/pom.xml index 8519b5cb3..9e934cd5e 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <artifactId>dhcp-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 67a2f1722..3424c1640 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <name>${project.artifactId}</name> <dependencies> diff --git a/interface-role/impl/pom.xml b/interface-role/impl/pom.xml index 651eb58d3..c543cad04 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../../common/impl-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.iface.role</groupId> <artifactId>impl</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</version> <name>${project.artifactId}</name> <dependencies> diff --git a/interface-role/pom.xml b/interface-role/pom.xml index 1cb08c1a7..885c3a6a3 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <name>${project.artifactId}</name> <modules> diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml index 75bf73c25..97a9260a6 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/ioam/impl/pom.xml b/ioam/impl/pom.xml index 67ef26087..a9544128b 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <properties> diff --git a/ioam/pom.xml b/ioam/pom.xml index 4174c8ecf..c3e392d51 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.ioam</groupId> <artifactId>vppioam-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 75908bbcd..64f4165db 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <name>${project.artifactId}</name> <properties> diff --git a/it/api-test/pom.xml b/it/api-test/pom.xml index 855eb2fca..a9c12d457 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../../common/hc2vpp-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>api-test</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</version> <name>${project.artifactId}</name> <dependencies> diff --git a/it/pom.xml b/it/pom.xml index ce894eb4a..f4199c308 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-SNAPSHOT</version> + <version>1.17.10</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 cee3dc2b5..466509a8b 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <dependencies> <dependency> diff --git a/l3/impl/pom.xml b/l3/impl/pom.xml index 77b52e584..6d7913c51 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <dependencies> <dependency> diff --git a/l3/pom.xml b/l3/pom.xml index eeadc1fd5..64b08395c 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <packaging>pom</packaging> diff --git a/l3/utils/pom.xml b/l3/utils/pom.xml index b11ae4507..1162a2749 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <dependencies> <dependency> diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index adc788484..ec484eb07 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <properties> <project.translate.groupId>io.fd.honeycomb</project.translate.groupId> - <naming.context.version>1.17.10-SNAPSHOT</naming.context.version> + <naming.context.version>1.17.10</naming.context.version> </properties> <dependencies> diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 1fd64de68..33dc99d44 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <properties> diff --git a/lisp/pom.xml b/lisp/pom.xml index c1b384b47..38cf40135 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.lisp</groupId> <artifactId>lisp-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 4477c6100..c4852718c 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <properties> - <naming.context.version>1.17.10-SNAPSHOT</naming.context.version> + <naming.context.version>1.17.10</naming.context.version> </properties> <dependencies> diff --git a/nat/nat2vpp/pom.xml b/nat/nat2vpp/pom.xml index 01bdbcc12..d58ea6e8f 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-SNAPSHOT</version> + <version>1.17.10</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat2vpp</artifactId> <name>${project.artifactId}</name> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <properties> - <honeycomb.infra.version>1.17.10-SNAPSHOT</honeycomb.infra.version> - <hc2vpp.common.version>1.17.10-SNAPSHOT</hc2vpp.common.version> + <honeycomb.infra.version>1.17.10</honeycomb.infra.version> + <hc2vpp.common.version>1.17.10</hc2vpp.common.version> </properties> <dependencies> diff --git a/nat/pom.xml b/nat/pom.xml index dfcf8fedb..f9b24e79f 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nat</groupId> <artifactId>nat-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 62ab566ca..62a7a9d9e 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 9ecc7626b..adacda177 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <properties> diff --git a/nsh/pom.xml b/nsh/pom.xml index d942047c3..96a734d14 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.nsh</groupId> <artifactId>vppnsh-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 a27f53c02..bc8ef4132 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}-SNAPSHOT-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-hc.tar.gz cp ${ARCHIVE} ${SOURCE_DIR} -ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz +ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-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}-SNAPSHOT/ ${BUILD_DIR}/ +mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}/ ${BUILD_DIR}/ cp -r $2 ${BUILD_DIR} # OS service definition @@ -41,7 +41,7 @@ EOT # Install instructions cat <<EOT >> ${BUILD_DIR}/debian/install -vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/ +vpp-integration-distribution-${VERSION}/* /opt/honeycomb/ $3 $4 EOT diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index 3c4e7efde..d759d8bb7 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}-SNAPSHOT-hc.zip +Source0: vpp-integration-distribution-%{_version}-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}-SNAPSHOT +%autosetup -n vpp-integration-distribution-%{_version} %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}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-distribution-%{_version}/* $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 258792295..3ec80eac1 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 -# $(expr $BUILD_NUMBER + 2000) +# echo $(expr $BUILD_NUMBER + 2000) # echo RC1~$(expr $BUILD_NUMBER + 2000) -echo RC2~$(expr $BUILD_NUMBER + 2000) +# echo RC2~$(expr $BUILD_NUMBER + 2000) # 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 d3f90feec..583b8a429 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-SNAPSHOT-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.10-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ @@ -17,13 +17,13 @@ <parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>hc2vpp-parent</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>hc2vpp-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 b34c6b85f..aed0bfecd 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp</groupId> <artifactId>release-notes-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</version> <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/routing/pom.xml b/routing/pom.xml index 561b39b2c..5b4eeff66 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.routing</groupId> <artifactId>routing-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 f5be93930..aa88bd3fc 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/routing/routing-impl/pom.xml b/routing/routing-impl/pom.xml index 159f8b231..0c67f849f 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/pom.xml b/samples/pom.xml index 8a6b041b3..835bae582 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-SNAPSHOT</version> + <version>1.17.10</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 618d9a6c2..9be9b2262 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/samples/samples-impl/pom.xml b/samples/samples-impl/pom.xml index 1c38bdc89..a919a7a53 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <dependencies> <!-- Api classes generated from yang model --> diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index bd8bbb27f..a9684b07d 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/v3po/pom.xml b/v3po/pom.xml index 603f4031b..536ff9224 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.v3po</groupId> <artifactId>v3po-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 ef0278d72..85f2b2c32 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/api/pom.xml b/vpp-classifier/api/pom.xml index 241ba4955..71e5808f4 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-classifier/impl/pom.xml b/vpp-classifier/impl/pom.xml index c23315b4a..5dfc71dc9 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <dependencies> <!-- Api --> <dependency> <groupId>io.fd.hc2vpp.vpp.classifier</groupId> <artifactId>vpp-classifier-api</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 e617ce20c..826e44dd3 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-SNAPSHOT</version> + <version>1.17.10</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 ea202209e..dfcfabc76 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml index 6c78e46fd..51f8ff127 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index 61b4675c5..a977cd86e 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../common/hc2vpp-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.common</groupId> <artifactId>vpp-common-aggregator</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</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 83a7fffec..fb84b7cdf 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <properties> - <honeycomb.min.distro.version>1.17.10-SNAPSHOT</honeycomb.min.distro.version> + <honeycomb.min.distro.version>1.17.10</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 4554cfb33..3f37a60fa 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>pom</packaging> <properties> diff --git a/vpp-common/vpp-translate-test/pom.xml b/vpp-common/vpp-translate-test/pom.xml index d91f4aff2..0abf36106 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../vpp-impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>vpp-translate-test</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <properties> diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml index ccfee3266..aeedbb6ec 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <packaging>bundle</packaging> <properties> diff --git a/vpp-integration/api-docs/api/pom.xml b/vpp-integration/api-docs/api/pom.xml index 52c24ea80..8d1b3600a 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</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 de50e2bbc..97fc4440b 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</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 3783d5254..1d32ac1b0 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-SNAPSHOT</version> + <version>1.17.10</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 cb1f1ac61..2d49859e5 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <modules> <module>core</module> diff --git a/vpp-integration/api-docs/scripts/pom.xml b/vpp-integration/api-docs/scripts/pom.xml index e69b4f11c..4d1804bdc 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-SNAPSHOT</version> + <version>1.17.10</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 b04891a00..e3abf3e91 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <properties> <main.class>io.fd.honeycomb.infra.distro.Main</main.class> - <v3po.version>1.17.10-SNAPSHOT</v3po.version> - <lisp.version>1.17.10-SNAPSHOT</lisp.version> - <hc.infra.version>1.17.10-SNAPSHOT</hc.infra.version> - <vpp.common.integration.version>1.17.10-SNAPSHOT</vpp.common.integration.version> - <vppnsh.version>1.17.10-SNAPSHOT</vppnsh.version> - <nat.version>1.17.10-SNAPSHOT</nat.version> - <ioam.version>1.17.10-SNAPSHOT</ioam.version> - <routing.version>1.17.10-SNAPSHOT</routing.version> - <acl.version>1.17.10-SNAPSHOT</acl.version> - <dhcp.version>1.17.10-SNAPSHOT</dhcp.version> - <vpp.classifier.version>1.17.10-SNAPSHOT</vpp.classifier.version> - <l3-impl.version>1.17.10-SNAPSHOT</l3-impl.version> - <vpp-management-impl.version>1.17.10-SNAPSHOT</vpp-management-impl.version> - <iface.role.version>1.17.10-SNAPSHOT</iface.role.version> - <hc2vpp.bgp.version>1.17.10-SNAPSHOT</hc2vpp.bgp.version> + <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> <distribution.modules> io.fd.hc2vpp.common.integration.VppCommonModule, diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index 1bdd655b1..8e78a48c5 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</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 90ca2da46..c1fdc11e6 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-SNAPSHOT</version> + <version>1.17.10</version> <relativePath>../../common/api-parent</relativePath> </parent> <groupId>io.fd.hc2vpp.management</groupId> <artifactId>vpp-management-api</artifactId> - <version>1.17.10-SNAPSHOT</version> + <version>1.17.10</version> </project>
\ No newline at end of file diff --git a/vpp-management/impl/pom.xml b/vpp-management/impl/pom.xml index f2d918037..7950bfc10 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <dependencies> <!-- Api --> diff --git a/vpp-management/pom.xml b/vpp-management/pom.xml index 8b5fa751b..70aedacf9 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-SNAPSHOT</version> + <version>1.17.10</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-SNAPSHOT</version> + <version>1.17.10</version> <description>Aggregator for Hc2vpp vpp-management plugin</description> <modules> diff --git a/vpp-version b/vpp-version index fea07c41e..30531913d 100755 --- a/vpp-version +++ b/vpp-version @@ -1,5 +1,5 @@ #!/bin/sh -echo 'RELEASE' +echo '17.10-release' # Determines which VPP version to use in hc2vpp-integration job. # 'RELEASE' will use the latest VPP in the respective branch. |