diff options
| author |   Maros Marsalek <mmarsale@cisco.com> | 2016-09-21 09:57:06 +0200 |
|---|---|---|
| committer | Maros Marsalek <mmarsale@cisco.com> | 2016-09-21 09:57:06 +0200 |
| commit | e045ef401a64de28420465f27ff852730cd80257 (patch) | |
| tree | d972080809bb0f87dcea95f978ccba3afd743396 | |
| parent | 926163ae36abcb0b62ef04206208585f49875022 (diff) | |
Bump version to 1.16.9 FINALv1.16.9-FINAL
Change-Id: I5dd38f7e9765fd3dded73b57358cdb1018232ad2
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
53 files changed, 100 insertions, 106 deletions
diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index 72e0b25b6..70ff33789 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -28,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.common</groupId> <artifactId>api-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>pom</packaging> <build> @@ -89,7 +89,7 @@ <groupId>io.fd.honeycomb.common</groupId> <artifactId>honeycomb-checkstyle</artifactId> <!-- Hardcoded version to prevent archetype generated projects to use their own project version --> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> </dependency> <!-- Necessary for logging checks --> <dependency> diff --git a/common/checkstyle/pom.xml b/common/checkstyle/pom.xml index a9d789f0b..648ba3a19 100644 --- a/common/checkstyle/pom.xml +++ b/common/checkstyle/pom.xml @@ -10,6 +10,6 @@ <groupId>io.fd.honeycomb.common</groupId> <artifactId>honeycomb-checkstyle</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> </project> diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index 71566e6d7..766435a25 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -26,7 +26,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>pom</packaging> <properties> @@ -94,7 +94,7 @@ <groupId>io.fd.honeycomb.common</groupId> <artifactId>honeycomb-checkstyle</artifactId> <!-- Hardcoded version to prevent archetype generated projects to use their own project version --> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> </dependency> <!-- Necessary for logging checks --> <dependency> diff --git a/common/minimal-assembly-descriptor/pom.xml b/common/minimal-assembly-descriptor/pom.xml index 24b4e722f..d13eb1212 100644 --- a/common/minimal-assembly-descriptor/pom.xml +++ b/common/minimal-assembly-descriptor/pom.xml @@ -17,7 +17,7 @@ <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-assembly-descriptor</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>${project.artifactId}</name> <modelVersion>4.0.0</modelVersion> diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 02356cb75..5e4bd159d 100644 --- a/common/minimal-distribution-parent/pom.xml +++ b/common/minimal-distribution-parent/pom.xml @@ -53,7 +53,7 @@ done <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>pom</packaging> <!-- Generate executable shell script --> @@ -200,7 +200,7 @@ done <dependency> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-assembly-descriptor</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> </dependency> </dependencies> <executions> diff --git a/common/pom.xml b/common/pom.xml index 1e9cb419a..736125322 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -17,7 +17,7 @@ <groupId>io.fd.honeycomb.common</groupId> <artifactId>honeycomb-common-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>honeycomb-common</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/infra/artifacts/pom.xml b/infra/artifacts/pom.xml index c58258a33..ca3e722e5 100644 --- a/infra/artifacts/pom.xml +++ b/infra/artifacts/pom.xml @@ -19,7 +19,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>honeycomb-artifacts</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>pom</packaging> <dependencyManagement> diff --git a/infra/cfg-init/pom.xml b/infra/cfg-init/pom.xml index 22b9568ee..423493198 100644 --- a/infra/cfg-init/pom.xml +++ b/infra/cfg-init/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>cfg-init</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/data-api/pom.xml b/infra/data-api/pom.xml index fd40ac77a..040171df5 100644 --- a/infra/data-api/pom.xml +++ b/infra/data-api/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>data-api</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/data-impl/pom.xml b/infra/data-impl/pom.xml index 67512e70e..9ff8ce344 100644 --- a/infra/data-impl/pom.xml +++ b/infra/data-impl/pom.xml @@ -19,14 +19,14 @@ <parent> <artifactId>impl-parent</artifactId> <groupId>io.fd.honeycomb.common</groupId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>data-impl</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/impl/pom.xml b/infra/impl/pom.xml index 5da1b2f60..84ecc45dd 100644 --- a/infra/impl/pom.xml +++ b/infra/impl/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>honeycomb-impl</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencies> <dependency> diff --git a/infra/it/it-test/pom.xml b/infra/it/it-test/pom.xml index 194dc5158..84a669c7b 100644 --- a/infra/it/it-test/pom.xml +++ b/infra/it/it-test/pom.xml @@ -19,14 +19,14 @@ <parent> <artifactId>impl-parent</artifactId> <groupId>io.fd.honeycomb.common</groupId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>honeycomb-it-test</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <dependencies> <dependency> diff --git a/infra/it/pom.xml b/infra/it/pom.xml index eecab0145..9495015db 100644 --- a/infra/it/pom.xml +++ b/infra/it/pom.xml @@ -17,7 +17,7 @@ <groupId>io.fd.honeycomb.common</groupId> <artifactId>honeycomb-it-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>honeycomb-it</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/infra/it/test-model/pom.xml b/infra/it/test-model/pom.xml index 9cf4bd3d7..488a09e44 100644 --- a/infra/it/test-model/pom.xml +++ b/infra/it/test-model/pom.xml @@ -17,14 +17,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>api-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>honeycomb-test-model</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/minimal-distribution/pom.xml b/infra/minimal-distribution/pom.xml index d6bf36dc2..8c8f75253 100644 --- a/infra/minimal-distribution/pom.xml +++ b/infra/minimal-distribution/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/minimal-distribution-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>minimal-distribution</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>${project.artifactId}</name> <prerequisites> diff --git a/infra/notification/api/pom.xml b/infra/notification/api/pom.xml index 9f5eb5db2..e5ac94ec8 100644 --- a/infra/notification/api/pom.xml +++ b/infra/notification/api/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>notification-api</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/notification/impl/pom.xml b/infra/notification/impl/pom.xml index 42cc45b6a..956e533de 100644 --- a/infra/notification/impl/pom.xml +++ b/infra/notification/impl/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>notification-impl</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/notification/pom.xml b/infra/notification/pom.xml index 41c14001f..16d184aa2 100644 --- a/infra/notification/pom.xml +++ b/infra/notification/pom.xml @@ -24,7 +24,7 @@ <groupId>io.fd.honeycomb</groupId> <artifactId>notification-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>notification</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/infra/pom.xml b/infra/pom.xml index 3e7088a57..5f2ec51b9 100644 --- a/infra/pom.xml +++ b/infra/pom.xml @@ -24,7 +24,7 @@ <groupId>io.fd.honeycomb</groupId> <artifactId>infra-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>infra</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/infra/translate-api/pom.xml b/infra/translate-api/pom.xml index 1205b8084..496237cf3 100644 --- a/infra/translate-api/pom.xml +++ b/infra/translate-api/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-api</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/infra/translate-impl/pom.xml b/infra/translate-impl/pom.xml index ca5577d08..66c5952d9 100644 --- a/infra/translate-impl/pom.xml +++ b/infra/translate-impl/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>api-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-impl</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/translate-spi/pom.xml b/infra/translate-spi/pom.xml index d93afe9ac..0e39e3276 100644 --- a/infra/translate-spi/pom.xml +++ b/infra/translate-spi/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>api-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-spi</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/infra/translate-utils/pom.xml b/infra/translate-utils/pom.xml index 4a0282a9f..9fb378804 100644 --- a/infra/translate-utils/pom.xml +++ b/infra/translate-utils/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-utils</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index df5b7b3ba..8aa8dfab5 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>api-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.lisp</groupId> <artifactId>lisp-api</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <properties> diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index 3d3a4dcbc..64b7ac954 100755 --- a/lisp/lisp2vpp/pom.xml +++ b/lisp/lisp2vpp/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.lisp</groupId> <artifactId>lisp2vpp</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <properties> diff --git a/lisp/pom.xml b/lisp/pom.xml index e55294ba2..b8306d482 100755 --- a/lisp/pom.xml +++ b/lisp/pom.xml @@ -25,7 +25,7 @@ <groupId>io.fd.honeycomb.lisp</groupId> <artifactId>lisp-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>lisp</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/nsh/api/pom.xml b/nsh/api/pom.xml index abab758f1..1740d089d 100644 --- a/nsh/api/pom.xml +++ b/nsh/api/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>api-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.vppnsh</groupId> <artifactId>vppnsh-api</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index a5d7c8141..6a15e193e 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -17,14 +17,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.vppnsh</groupId> <artifactId>vppnsh-impl</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <properties> @@ -85,12 +85,6 @@ <groupId>io.fd.nsh_sfc</groupId> <artifactId>nsh-sfc</artifactId> <version>16.09</version> - <exclusions> - <exclusion> - <groupId>io.fd.vpp</groupId> - <artifactId>jvpp-registry</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.fd.honeycomb.vpp</groupId> diff --git a/nsh/pom.xml b/nsh/pom.xml index 2c51641d2..71d4ca95b 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -24,7 +24,7 @@ <groupId>io.fd.honeycomb.nsh</groupId> <artifactId>vppnsh-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>vppnsh</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/deb/debuild.sh b/packaging/deb/debuild.sh index 8da088d41..3327d1f10 100755 --- a/packaging/deb/debuild.sh +++ b/packaging/deb/debuild.sh @@ -8,9 +8,9 @@ PACKAGING_ROOT=${DIR}/honeycomb-${VERSION} # Copy and unpack the archive with vpp-integration distribution ARCHIVE_DIR=${DIR}/../../vpp-integration/minimal-distribution/target/ -ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-1.16.9-SNAPSHOT-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-hc.tar.gz cp ${ARCHIVE} ${DIR} -ARCHIVE=${DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz +ARCHIVE=${DIR}/vpp-integration-distribution-${VERSION}-hc.tar.gz tar -xf ${ARCHIVE} -C ${DIR}/ # Create packaging root @@ -18,7 +18,7 @@ rm -rf ${PACKAGING_ROOT} mkdir ${PACKAGING_ROOT} # Copy contents of tar.gz -mv ${DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${PACKAGING_ROOT}/ +mv ${DIR}/vpp-integration-distribution-${VERSION}/ ${PACKAGING_ROOT}/ cp -r ${DIR}/debian/ ${PACKAGING_ROOT} # Upstart configuration @@ -28,14 +28,14 @@ cp ${DIR}/honeycomb.conf ${PACKAGING_ROOT} cat <<EOT >> ${PACKAGING_ROOT}/debian/changelog honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low - * Initial release + * Formal 1609 release -- mmarsale <mmarsale@cisco.com> Mon, 22 Aug 2016 09:41:37 +0200 EOT # Install instructions cat <<EOT >> ${PACKAGING_ROOT}/debian/install -vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/ +vpp-integration-distribution-${VERSION}/* /opt/honeycomb/ honeycomb.conf /etc/init/ EOT diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index f15d7e133..e14f65095 100644 --- a/packaging/rpm/honeycomb.spec +++ b/packaging/rpm/honeycomb.spec @@ -16,7 +16,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, java >= 1:1.8.0 # Required for creating honeycomb group @@ -37,13 +37,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 c4bf723b5..8720190bb 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,2 +1,2 @@ #!/bin/bash -echo $BUILD_NUMBER +echo FINAL diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index dc28cddd0..01a174d99 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.16.9-SNAPSHOT-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.16.9-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ @@ -21,7 +21,7 @@ <groupId>io.fd.honeycomb</groupId> <artifactId>honeycomb-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>honeycomb</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/samples/interfaces/mapping/pom.xml b/samples/interfaces/mapping/pom.xml index 998a6df3d..30827b5ec 100644 --- a/samples/interfaces/mapping/pom.xml +++ b/samples/interfaces/mapping/pom.xml @@ -17,18 +17,18 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.samples.interfaces</groupId> <artifactId>interfaces-mapping</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <properties> - <honeycomb.infra.version>1.16.9-SNAPSHOT</honeycomb.infra.version> + <honeycomb.infra.version>1.16.9</honeycomb.infra.version> </properties> <dependencies> diff --git a/samples/interfaces/models/pom.xml b/samples/interfaces/models/pom.xml index 2f5d9f851..445b155e8 100644 --- a/samples/interfaces/models/pom.xml +++ b/samples/interfaces/models/pom.xml @@ -17,14 +17,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>api-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.samples.interfaces</groupId> <artifactId>interfaces-models</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/samples/interfaces/pom.xml b/samples/interfaces/pom.xml index 49bca0f0a..ec01a9d14 100644 --- a/samples/interfaces/pom.xml +++ b/samples/interfaces/pom.xml @@ -24,7 +24,7 @@ <groupId>io.fd.honeycomb.samples.interfaces</groupId> <artifactId>interfaces-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>interfaces</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/samples/minimal-distribution/pom.xml b/samples/minimal-distribution/pom.xml index d9280257d..80a17cff1 100644 --- a/samples/minimal-distribution/pom.xml +++ b/samples/minimal-distribution/pom.xml @@ -18,20 +18,20 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/minimal-distribution-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.samples.distro</groupId> <artifactId>minimal-distribution</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <properties> <exec.parameters>-Xms128m -Xmx128m</exec.parameters> <main.class>io.fd.honeycomb.samples.distro.Main</main.class> - <interfaces.mapping.version>1.16.9-SNAPSHOT</interfaces.mapping.version> - <honeycomb.min.distro.version>1.16.9-SNAPSHOT</honeycomb.min.distro.version> + <interfaces.mapping.version>1.16.9</interfaces.mapping.version> + <honeycomb.min.distro.version>1.16.9</honeycomb.min.distro.version> </properties> <build> diff --git a/samples/pom.xml b/samples/pom.xml index 90cd8484b..86bd00b60 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -24,7 +24,7 @@ <groupId>io.fd.honeycomb</groupId> <artifactId>samples-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>samples</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/tools/archetype/pom.xml b/tools/archetype/pom.xml index d19c46469..02e7d990d 100644 --- a/tools/archetype/pom.xml +++ b/tools/archetype/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>honeycomb-tools</artifactId> <groupId>io.fd.honeycomb.tools</groupId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.tools</groupId> <artifactId>honeycomb-plugin-archetype</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>jar</packaging> </project>
\ No newline at end of file diff --git a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml index d8f5ec298..f215cb338 100644 --- a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml +++ b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>api-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/pom.xml b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/pom.xml index 8a073e570..c8ee6672e 100644 --- a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/pom.xml +++ b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -26,7 +26,7 @@ <packaging>bundle</packaging> <properties> - <honeycomb.infra.version>1.16.9-SNAPSHOT</honeycomb.infra.version> + <honeycomb.infra.version>1.16.9</honeycomb.infra.version> </properties> <dependencies> diff --git a/tools/pom.xml b/tools/pom.xml index ae2740584..212829fe5 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -5,14 +5,14 @@ <parent> <artifactId>honeycomb-aggregator</artifactId> <groupId>io.fd.honeycomb</groupId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.tools</groupId> <artifactId>honeycomb-tools</artifactId> <packaging>pom</packaging> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <modules> <module>archetype</module> </modules> diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index 127699173..170fdd21e 100644 --- a/v3po/api/pom.xml +++ b/v3po/api/pom.xml @@ -17,14 +17,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>api-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.v3po</groupId> <artifactId>v3po-api</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/v3po/pom.xml b/v3po/pom.xml index 49d0206bd..b99e385ca 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -24,7 +24,7 @@ <groupId>io.fd.honeycomb.v3po</groupId> <artifactId>v3po-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>v3po</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml index 1c8735dad..27cec655c 100644 --- a/v3po/v3po2vpp/pom.xml +++ b/v3po/v3po2vpp/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.v3po</groupId> <artifactId>v3po2vpp</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-common/minimal-distribution/pom.xml b/vpp-common/minimal-distribution/pom.xml index 1b84b20f0..7e79092e8 100644 --- a/vpp-common/minimal-distribution/pom.xml +++ b/vpp-common/minimal-distribution/pom.xml @@ -18,18 +18,18 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/minimal-distribution-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.vpp</groupId> <artifactId>minimal-distribution</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <properties> <main.class>io.fd.honeycomb.vpp.distro.Main</main.class> - <honeycomb.min.distro.version>1.16.9-SNAPSHOT</honeycomb.min.distro.version> + <honeycomb.min.distro.version>1.16.9</honeycomb.min.distro.version> </properties> <build> diff --git a/vpp-common/naming-context-api/pom.xml b/vpp-common/naming-context-api/pom.xml index f9c8e1ed3..ceebf05eb 100644 --- a/vpp-common/naming-context-api/pom.xml +++ b/vpp-common/naming-context-api/pom.xml @@ -17,14 +17,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>api-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.vpp</groupId> <artifactId>naming-context-api</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml index 9a578c12b..10b9cdf25 100644 --- a/vpp-common/naming-context-impl/pom.xml +++ b/vpp-common/naming-context-impl/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.vpp</groupId> <artifactId>naming-context-impl</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <dependencies> <dependency> diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index 1c710c0b0..82fb8303c 100644 --- a/vpp-common/pom.xml +++ b/vpp-common/pom.xml @@ -24,7 +24,7 @@ <groupId>io.fd.honeycomb.vpp</groupId> <artifactId>vpp-common-aggregator</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <name>vpp-common</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/vpp-common/vpp-translate-utils/pom.xml b/vpp-common/vpp-translate-utils/pom.xml index d7f18fe6e..24842959e 100644 --- a/vpp-common/vpp-translate-utils/pom.xml +++ b/vpp-common/vpp-translate-utils/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.vpp</groupId> <artifactId>vpp-translate-utils</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index ecf0497f0..2cd25fed0 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -18,21 +18,21 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <relativePath>../../common/minimal-distribution-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.vpp.integration</groupId> <artifactId>vpp-integration-distribution</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <properties> <main.class>io.fd.honeycomb.vpp.integration.distro.Main</main.class> - <v3po.version>1.16.9-SNAPSHOT</v3po.version> - <lisp.version>1.16.9-SNAPSHOT</lisp.version> - <vpp.common.min.distro.version>1.16.9-SNAPSHOT</vpp.common.min.distro.version> - <vppnsh.version>1.16.9-SNAPSHOT</vppnsh.version> + <v3po.version>1.16.9</v3po.version> + <lisp.version>1.16.9</lisp.version> + <vpp.common.min.distro.version>1.16.9</vpp.common.min.distro.version> + <vppnsh.version>1.16.9</vppnsh.version> </properties> <build> diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index 32348229f..616b896ed 100644 --- a/vpp-integration/pom.xml +++ b/vpp-integration/pom.xml @@ -24,7 +24,7 @@ <groupId>io.fd.honeycomb.vpp.integration</groupId> <artifactId>vpp-integration</artifactId> - <version>1.16.9-SNAPSHOT</version> + <version>1.16.9</version> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> <prerequisites> |