diff options
55 files changed, 100 insertions, 100 deletions
diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index a28a79ddd..72e0b25b6 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> </dependency> <!-- Necessary for logging checks --> <dependency> diff --git a/common/checkstyle/pom.xml b/common/checkstyle/pom.xml index 9751f896e..a9d789f0b 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> </project> diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index c9267995a..71566e6d7 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> </dependency> <!-- Necessary for logging checks --> <dependency> diff --git a/common/minimal-assembly-descriptor/pom.xml b/common/minimal-assembly-descriptor/pom.xml index d1ddf27f6..24b4e722f 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-RC1</version> + <version>1.16.9-SNAPSHOT</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 bfb63b024..02356cb75 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> </dependency> </dependencies> <executions> diff --git a/common/pom.xml b/common/pom.xml index fb9f2b884..5222ac96b 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <name>honeycomb</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/infra/artifacts/pom.xml b/infra/artifacts/pom.xml index bb9886106..c58258a33 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>pom</packaging> <dependencyManagement> diff --git a/infra/cfg-init/pom.xml b/infra/cfg-init/pom.xml index 27efe83f1..22b9568ee 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/data-api/pom.xml b/infra/data-api/pom.xml index 999f72b02..fd40ac77a 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/data-impl/pom.xml b/infra/data-impl/pom.xml index 789af9d45..67512e70e 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/impl/pom.xml b/infra/impl/pom.xml index 58e2ef7f7..5da1b2f60 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> <dependency> diff --git a/infra/it/it-test/pom.xml b/infra/it/it-test/pom.xml index fa6878a53..194dc5158 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <dependencies> <dependency> diff --git a/infra/it/pom.xml b/infra/it/pom.xml index d2f6738f8..b7e334765 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <name>honeycomb</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 d5c25f3c5..9cf4bd3d7 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/minimal-distribution/pom.xml b/infra/minimal-distribution/pom.xml index ad3621bd7..d6bf36dc2 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <name>${project.artifactId}</name> <prerequisites> diff --git a/infra/notification/api/pom.xml b/infra/notification/api/pom.xml index 9e2de61bb..9f5eb5db2 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/notification/impl/pom.xml b/infra/notification/impl/pom.xml index 4b74d52dd..42cc45b6a 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/notification/pom.xml b/infra/notification/pom.xml index f5d305ab4..41c14001f 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <name>notification</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/infra/pom.xml b/infra/pom.xml index 1a14580ef..d530d7eba 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <name>honeycomb-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 0d74a9ec0..1205b8084 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/infra/translate-impl/pom.xml b/infra/translate-impl/pom.xml index f05ff91d3..ca5577d08 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/infra/translate-spi/pom.xml b/infra/translate-spi/pom.xml index febd3cf71..d93afe9ac 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/infra/translate-utils/pom.xml b/infra/translate-utils/pom.xml index 7fd2f8a35..4a0282a9f 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index 39def019a..df5b7b3ba 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/lisp/lisp2vpp/pom.xml b/lisp/lisp2vpp/pom.xml index a5753b671..a606527b9 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <properties> diff --git a/lisp/pom.xml b/lisp/pom.xml index d4ed1222c..e55294ba2 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-RC1</version> + <version>1.16.9-SNAPSHOT</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 a9a47bbf5..86e76669f 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <relativePath>../../common/api-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.v3po</groupId> <artifactId>nsh-api</artifactId> - <version>1.16.9-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/nsh/impl/pom.xml b/nsh/impl/pom.xml index 2dda6c075..4fa591f1d 100644 --- a/nsh/impl/pom.xml +++ b/nsh/impl/pom.xml @@ -18,14 +18,14 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>impl-parent</artifactId> - <version>1.16.9-RC1</version> + <version>1.16.9-SNAPSHOT</version> <relativePath>../../common/impl-parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.v3po</groupId> <artifactId>nsh-impl</artifactId> - <version>1.16.9-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/nsh/pom.xml b/nsh/pom.xml index 6ebd11459..11a00b910 100644 --- a/nsh/pom.xml +++ b/nsh/pom.xml @@ -24,7 +24,7 @@ <groupId>io.fd.honeycomb.v3po</groupId> <artifactId>nsh-aggregator</artifactId> - <version>1.16.9-RC1</version> + <version>1.16.9-SNAPSHOT</version> <name>nsh</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/deb/debuild.sh b/packaging/deb/debuild.sh index 3b1c11e23..8da088d41 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-RC1-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-1.16.9-SNAPSHOT-hc.tar.gz cp ${ARCHIVE} ${DIR} -ARCHIVE=${DIR}/vpp-integration-distribution-${VERSION}-RC1-hc.tar.gz +ARCHIVE=${DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-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}-RC1/ ${PACKAGING_ROOT}/ +mv ${DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${PACKAGING_ROOT}/ cp -r ${DIR}/debian/ ${PACKAGING_ROOT} # Upstart configuration @@ -35,7 +35,7 @@ EOT # Install instructions cat <<EOT >> ${PACKAGING_ROOT}/debian/install -vpp-integration-distribution-${VERSION}-RC1/* /opt/honeycomb/ +vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/ honeycomb.conf /etc/init/ EOT diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index 8c31e4dbb..f15d7e133 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}-RC1-hc.zip +Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-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}-RC1 +%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT %install # Create directory in build root for Honeycomb mkdir -p $RPM_BUILD_ROOT/opt/%name # Copy Honeycomb from archive to its dir in build root -cp -r ../vpp-integration-distribution-%{_version}-RC1/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name # Create directory in build root for systemd .service file mkdir -p $RPM_BUILD_ROOT/%{_unitdir} # Copy Honeycomb's systemd .service file to correct dir in build root diff --git a/packaging/rpm/release b/packaging/rpm/release index f05239422..81f39a3c4 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,2 +1,2 @@ #!/bin/bash -echo RC1 +echo SNAPSHOT diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index 74530d873..dc28cddd0 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-RC1-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.16.9-SNAPSHOT-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-RC1</version> + <version>1.16.9-SNAPSHOT</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 4d05d73ae..998a6df3d 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <properties> - <honeycomb.infra.version>1.16.9-RC1</honeycomb.infra.version> + <honeycomb.infra.version>1.16.9-SNAPSHOT</honeycomb.infra.version> </properties> <dependencies> diff --git a/samples/interfaces/models/pom.xml b/samples/interfaces/models/pom.xml index c77e86ed2..2f5d9f851 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/samples/interfaces/pom.xml b/samples/interfaces/pom.xml index 27e6d2d62..00611d92d 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <name>honeycomb-infra</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/samples/minimal-distribution/pom.xml b/samples/minimal-distribution/pom.xml index d77b81595..d9280257d 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <properties> <exec.parameters>-Xms128m -Xmx128m</exec.parameters> <main.class>io.fd.honeycomb.samples.distro.Main</main.class> - <interfaces.mapping.version>1.16.9-RC1</interfaces.mapping.version> - <honeycomb.min.distro.version>1.16.9-RC1</honeycomb.min.distro.version> + <interfaces.mapping.version>1.16.9-SNAPSHOT</interfaces.mapping.version> + <honeycomb.min.distro.version>1.16.9-SNAPSHOT</honeycomb.min.distro.version> </properties> <build> diff --git a/samples/pom.xml b/samples/pom.xml index 5b10398af..4ce227e44 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <name>honeycomb-infra</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> diff --git a/tools/archetype/Readme.adoc b/tools/archetype/Readme.adoc index 698412c09..0ffcd9cf9 100644 --- a/tools/archetype/Readme.adoc +++ b/tools/archetype/Readme.adoc @@ -4,7 +4,7 @@ Honeycomb Plugin Archetype How to use it : - archetype:generate -DarchetypeGroupId=io.fd.honeycomb.tools -DarchetypeArtifactId=honeycomb-plugin-archetype -DarchetypeVersion=1.16.9-RC1 + archetype:generate -DarchetypeGroupId=io.fd.honeycomb.tools -DarchetypeArtifactId=honeycomb-plugin-archetype -DarchetypeVersion=1.16.9-SNAPSHOT This will generate main aggregator project containing two sub-projects diff --git a/tools/archetype/pom.xml b/tools/archetype/pom.xml index 220d9453e..d19c46469 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.tools</groupId> <artifactId>honeycomb-plugin-archetype</artifactId> - <version>1.16.9-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>jar</packaging> </project>
\ No newline at end of file diff --git a/tools/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index ecea6794f..579f0524f 100644 --- a/tools/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/tools/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -6,7 +6,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <requiredProperties> <requiredProperty key="version"> - <defaultValue>1.16.9-RC1</defaultValue> + <defaultValue>1.16.9-SNAPSHOT</defaultValue> </requiredProperty> </requiredProperties> 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 1246a02e8..d8f5ec298 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-RC1</version> + <version>1.16.9-SNAPSHOT</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 f2e3b6052..8a073e570 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -26,7 +26,7 @@ <packaging>bundle</packaging> <properties> - <honeycomb.infra.version>1.16.9-RC1</honeycomb.infra.version> + <honeycomb.infra.version>1.16.9-SNAPSHOT</honeycomb.infra.version> </properties> <dependencies> diff --git a/tools/pom.xml b/tools/pom.xml index d151e8610..ae2740584 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb.tools</groupId> <artifactId>honeycomb-tools</artifactId> <packaging>pom</packaging> - <version>1.16.9-RC1</version> + <version>1.16.9-SNAPSHOT</version> <modules> <module>archetype</module> </modules> diff --git a/v3po/api/pom.xml b/v3po/api/pom.xml index b1b1a8b08..127699173 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/v3po/pom.xml b/v3po/pom.xml index ea077af0d..49d0206bd 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-RC1</version> + <version>1.16.9-SNAPSHOT</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 7dbd5812c..37cdcc29e 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/vpp-common/minimal-distribution/pom.xml b/vpp-common/minimal-distribution/pom.xml index 7f5ca732f..98b8e1363 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <properties> <main.class>io.fd.honeycomb.vpp.distro.Main</main.class> - <honeycomb.min.distro.version>1.16.9-RC1</honeycomb.min.distro.version> + <honeycomb.min.distro.version>1.16.9-SNAPSHOT</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 2324eb9d1..f9c8e1ed3 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/vpp-common/naming-context-impl/pom.xml b/vpp-common/naming-context-impl/pom.xml index d65f795c9..9a578c12b 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <dependencies> <dependency> diff --git a/vpp-common/pom.xml b/vpp-common/pom.xml index cde62e90c..f961264f3 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <name>v3po</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 9262a6165..bc9174b06 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-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>bundle</packaging> <dependencyManagement> diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml index 314f3b5ce..e3244c203 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -18,20 +18,20 @@ <parent> <groupId>io.fd.honeycomb.common</groupId> <artifactId>minimal-distribution-parent</artifactId> - <version>1.16.9-RC1</version> + <version>1.16.9-SNAPSHOT</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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <properties> <main.class>io.fd.honeycomb.vpp.integration.distro.Main</main.class> - <v3po.version>1.16.9-RC1</v3po.version> - <lisp.version>1.16.9-RC1</lisp.version> - <vpp.common.min.distro.version>1.16.9-RC1</vpp.common.min.distro.version> + <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> </properties> <build> diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml index fadd06ed4..32348229f 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-RC1</version> + <version>1.16.9-SNAPSHOT</version> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> <prerequisites> |