From be19e98376d62d89187095ccf1178fa958816dfb Mon Sep 17 00:00:00 2001 From: Richard Downer Date: Mon, 2 Mar 2020 17:13:17 +0000 Subject: [PATCH] Set version to 1.1.0-SNAPSHOT --- all/pom.xml | 2 +- archetypes/quickstart/NOTES.txt | 2 +- archetypes/quickstart/pom.xml | 2 +- archetypes/quickstart/src/brooklyn-sample/pom.xml | 2 +- deb-packaging/pom.xml | 2 +- dist/pom.xml | 2 +- dist/src/main/dist/conf/brooklyn/default.catalog.bom | 2 +- docker-image/pom.xml | 2 +- docker/Makefile | 2 +- docker/brooklyn-docker-start | 2 +- downstream-parent/pom.xml | 2 +- karaf/apache-brooklyn/pom.xml | 2 +- .../src/main/resources/etc/default.catalog.bom | 2 +- karaf/config/pom.xml | 2 +- .../config/src/main/resources/catalog/catalog-core.bom | 6 +++--- .../src/main/resources/catalog/catalog-templates.bom | 2 +- karaf/config/src/main/resources/catalog/catalog.bom | 2 +- karaf/features/pom.xml | 2 +- karaf/itest/pom.xml | 2 +- karaf/pom.xml | 2 +- pom.xml | 2 +- rpm-packaging/pom.xml | 2 +- shared-packaging/pom.xml | 2 +- shared-packaging/src/test/yaml/package-apps.yaml | 8 ++++---- shared-packaging/src/test/yaml/package.bom | 2 +- vagrant/pom.xml | 2 +- vagrant/src/main/vagrant/README.md | 4 ++-- vagrant/src/main/vagrant/files/vagrant-catalog.bom | 10 +++++----- vagrant/src/main/vagrant/servers.yaml | 2 +- 29 files changed, 39 insertions(+), 39 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 7c7c790b5c..42c624fc58 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -31,7 +31,7 @@ org.apache.brooklyn brooklyn-dist-root - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../pom.xml diff --git a/archetypes/quickstart/NOTES.txt b/archetypes/quickstart/NOTES.txt index 9b609d1bea..f68a529aa9 100644 --- a/archetypes/quickstart/NOTES.txt +++ b/archetypes/quickstart/NOTES.txt @@ -32,7 +32,7 @@ To test a build: pushd /tmp rm -rf brooklyn-sample - export BV=1.0.0-SNAPSHOT # BROOKLYN_VERSION + export BV=1.1.0-SNAPSHOT # BROOKLYN_VERSION mvn archetype:generate \ \ diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index 221d9c6670..420c69a3eb 100644 --- a/archetypes/quickstart/pom.xml +++ b/archetypes/quickstart/pom.xml @@ -31,7 +31,7 @@ org.apache.brooklyn brooklyn-parent - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../../../brooklyn-server/parent/pom.xml diff --git a/archetypes/quickstart/src/brooklyn-sample/pom.xml b/archetypes/quickstart/src/brooklyn-sample/pom.xml index 5b48002714..2b5a7dae27 100644 --- a/archetypes/quickstart/src/brooklyn-sample/pom.xml +++ b/archetypes/quickstart/src/brooklyn-sample/pom.xml @@ -7,7 +7,7 @@ org.apache.brooklyn brooklyn-downstream-parent - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT com.acme.sample diff --git a/deb-packaging/pom.xml b/deb-packaging/pom.xml index 8e3ed4da67..b8b14b49a7 100644 --- a/deb-packaging/pom.xml +++ b/deb-packaging/pom.xml @@ -37,7 +37,7 @@ org.apache.brooklyn brooklyn-dist-root - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../pom.xml diff --git a/dist/pom.xml b/dist/pom.xml index 3d0fc5e105..40665c9778 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -32,7 +32,7 @@ org.apache.brooklyn brooklyn-dist-root - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../pom.xml diff --git a/dist/src/main/dist/conf/brooklyn/default.catalog.bom b/dist/src/main/dist/conf/brooklyn/default.catalog.bom index f435a1c720..b6f78655b2 100644 --- a/dist/src/main/dist/conf/brooklyn/default.catalog.bom +++ b/dist/src/main/dist/conf/brooklyn/default.catalog.bom @@ -3,7 +3,7 @@ brooklyn.catalog: bundle: brooklyn-default-catalog - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION # load everything in the classpath with a @Catalog annotation scanJavaAnnotations: true diff --git a/docker-image/pom.xml b/docker-image/pom.xml index b871ee5fec..d67363b482 100755 --- a/docker-image/pom.xml +++ b/docker-image/pom.xml @@ -29,7 +29,7 @@ org.apache.brooklyn brooklyn-dist-root - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../pom.xml diff --git a/docker/Makefile b/docker/Makefile index b54c7be9bd..cc35acd7f6 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -17,7 +17,7 @@ # under the License. # -BROOKLYN_VERSION=1.0.0-SNAPSHOT +BROOKLYN_VERSION=1.1.0-SNAPSHOT default: all diff --git a/docker/brooklyn-docker-start b/docker/brooklyn-docker-start index d2a5841b38..42f31c0f86 100755 --- a/docker/brooklyn-docker-start +++ b/docker/brooklyn-docker-start @@ -33,7 +33,7 @@ function help() { echo # BROOKLYN_VERSION_BELOW - echo 'Apache Brooklyn 1.0.0-SNAPSHOT convenience launcher'${application:+" for ${application}"} + echo 'Apache Brooklyn 1.1.0-SNAPSHOT convenience launcher'${application:+" for ${application}"} echo echo 'Usage: [OPTIONS] [--help | LOCATION | COMMAND] [ARGS]' echo diff --git a/downstream-parent/pom.xml b/downstream-parent/pom.xml index 40765bf5a4..64af79fec7 100644 --- a/downstream-parent/pom.xml +++ b/downstream-parent/pom.xml @@ -23,7 +23,7 @@ org.apache.brooklyn brooklyn-server - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../../brooklyn-server/pom.xml + 1.1.0-SNAPSHOT ../pom.xml diff --git a/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom b/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom index 70625a3b48..247c978c7e 100644 --- a/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom +++ b/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom @@ -4,6 +4,6 @@ brooklyn.catalog: bundle: brooklyn-default-karaf-catalog - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION items: - file:catalog/catalog.bom diff --git a/karaf/config/pom.xml b/karaf/config/pom.xml index 3decf96a97..971c168ef2 100644 --- a/karaf/config/pom.xml +++ b/karaf/config/pom.xml @@ -5,7 +5,7 @@ brooklyn-dist-karaf org.apache.brooklyn - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT 4.0.0 diff --git a/karaf/config/src/main/resources/catalog/catalog-core.bom b/karaf/config/src/main/resources/catalog/catalog-core.bom index af45d6c0e9..feb01b869f 100644 --- a/karaf/config/src/main/resources/catalog/catalog-core.bom +++ b/karaf/config/src/main/resources/catalog/catalog-core.bom @@ -16,8 +16,8 @@ # under the License. # brooklyn.catalog: - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION brooklyn.libraries: - - mvn:org.apache.brooklyn/brooklyn-karaf-init/1.0.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-library-catalog/1.0.0-SNAPSHOT # BROOKLYN_VERSION \ No newline at end of file + - mvn:org.apache.brooklyn/brooklyn-karaf-init/1.1.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-library-catalog/1.1.0-SNAPSHOT # BROOKLYN_VERSION \ No newline at end of file diff --git a/karaf/config/src/main/resources/catalog/catalog-templates.bom b/karaf/config/src/main/resources/catalog/catalog-templates.bom index c32b93c519..66741c0e35 100644 --- a/karaf/config/src/main/resources/catalog/catalog-templates.bom +++ b/karaf/config/src/main/resources/catalog/catalog-templates.bom @@ -16,7 +16,7 @@ # under the License. # brooklyn.catalog: - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION items: - id: 1-server-template diff --git a/karaf/config/src/main/resources/catalog/catalog.bom b/karaf/config/src/main/resources/catalog/catalog.bom index 64cfabd615..7c79198138 100644 --- a/karaf/config/src/main/resources/catalog/catalog.bom +++ b/karaf/config/src/main/resources/catalog/catalog.bom @@ -16,7 +16,7 @@ # under the License. # brooklyn.catalog: - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION items: - 'file:catalog/catalog-core.bom' diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml index 7c1b9a9ea9..d1bac167b3 100644 --- a/karaf/features/pom.xml +++ b/karaf/features/pom.xml @@ -24,7 +24,7 @@ org.apache.brooklyn brooklyn-dist-karaf - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../pom.xml diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml index 18ff28b1ee..3564bd6861 100644 --- a/karaf/itest/pom.xml +++ b/karaf/itest/pom.xml @@ -26,7 +26,7 @@ org.apache.brooklyn brooklyn-dist-karaf - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../pom.xml diff --git a/karaf/pom.xml b/karaf/pom.xml index 19d3c4ee35..7a29eb9f5f 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -33,7 +33,7 @@ brooklyn-server - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../../brooklyn-server/pom.xml diff --git a/pom.xml b/pom.xml index e5c3db988e..00b0045508 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.brooklyn brooklyn-parent - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../brooklyn-server/parent/pom.xml diff --git a/rpm-packaging/pom.xml b/rpm-packaging/pom.xml index 33ab13168b..e1c02579ff 100644 --- a/rpm-packaging/pom.xml +++ b/rpm-packaging/pom.xml @@ -37,7 +37,7 @@ org.apache.brooklyn brooklyn-dist-root - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../pom.xml diff --git a/shared-packaging/pom.xml b/shared-packaging/pom.xml index 25c6376f74..0785cd4be6 100644 --- a/shared-packaging/pom.xml +++ b/shared-packaging/pom.xml @@ -29,7 +29,7 @@ org.apache.brooklyn brooklyn-dist-root - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../pom.xml diff --git a/shared-packaging/src/test/yaml/package-apps.yaml b/shared-packaging/src/test/yaml/package-apps.yaml index 76518de208..12599f736c 100644 --- a/shared-packaging/src/test/yaml/package-apps.yaml +++ b/shared-packaging/src/test/yaml/package-apps.yaml @@ -25,7 +25,7 @@ services: # privateKeyFile: ~/.ssh/ user: ubuntu brooklyn.config: - package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/1.0.0-SNAPSHOT/deb-packaging-1.0.0-SNAPSHOT-all.deb # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/1.1.0-SNAPSHOT/deb-packaging-1.1.0-SNAPSHOT-all.deb # BROOKLYN_VERSION --- @@ -38,7 +38,7 @@ services: # privateKeyFile: ~/.ssh/ user: vagrant brooklyn.config: - package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/1.0.0-SNAPSHOT/deb-packaging-1.0.0-SNAPSHOT-all.deb # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/1.1.0-SNAPSHOT/deb-packaging-1.1.0-SNAPSHOT-all.deb # BROOKLYN_VERSION --- @@ -51,7 +51,7 @@ services: # privateKeyFile: ~/.ssh/ user: vagrant brooklyn.config: - package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/1.0.0-SNAPSHOT/rpm-packaging-1.0.0-SNAPSHOT-noarch.rpm # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/1.1.0-SNAPSHOT/rpm-packaging-1.1.0-SNAPSHOT-noarch.rpm # BROOKLYN_VERSION --- @@ -64,6 +64,6 @@ services: # privateKeyFile: ~/.ssh/ user: vagrant brooklyn.config: - package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/1.0.0-SNAPSHOT/rpm-packaging-1.0.0-SNAPSHOT-noarch.rpm # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/1.1.0-SNAPSHOT/rpm-packaging-1.1.0-SNAPSHOT-noarch.rpm # BROOKLYN_VERSION diff --git a/shared-packaging/src/test/yaml/package.bom b/shared-packaging/src/test/yaml/package.bom index 0e5900baa5..83ae6970db 100644 --- a/shared-packaging/src/test/yaml/package.bom +++ b/shared-packaging/src/test/yaml/package.bom @@ -17,7 +17,7 @@ # under the License. # brooklyn.catalog: - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION items: - id: systemd-brooklyn diff --git a/vagrant/pom.xml b/vagrant/pom.xml index faa6a9ca09..139f1cbc18 100644 --- a/vagrant/pom.xml +++ b/vagrant/pom.xml @@ -32,7 +32,7 @@ org.apache.brooklyn brooklyn-dist-root - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../pom.xml diff --git a/vagrant/src/main/vagrant/README.md b/vagrant/src/main/vagrant/README.md index 6f77f38146..fb58ecb81f 100644 --- a/vagrant/src/main/vagrant/README.md +++ b/vagrant/src/main/vagrant/README.md @@ -8,7 +8,7 @@ ``` env: - BROOKLYN_VERSION: 1.0.0-SNAPSHOT + BROOKLYN_VERSION: 1.1.0-SNAPSHOT ``` 2. You may proceed to use the `Vagrantfile` as normal; `vagrant up`, `vagrant destroy` etc. @@ -19,7 +19,7 @@ ``` env: - BROOKLYN_VERSION: 1.0.0-SNAPSHOT + BROOKLYN_VERSION: 1.1.0-SNAPSHOT ``` 2. Set the `INSTALL_FROM_LOCAL_DIST:` environment variable in `servers.yaml` to `true`. For example: diff --git a/vagrant/src/main/vagrant/files/vagrant-catalog.bom b/vagrant/src/main/vagrant/files/vagrant-catalog.bom index d8bcbee83d..89b62ae549 100644 --- a/vagrant/src/main/vagrant/files/vagrant-catalog.bom +++ b/vagrant/src/main/vagrant/files/vagrant-catalog.bom @@ -19,7 +19,7 @@ brooklyn.catalog: items: - id: byon1 - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location name: Vagrant BYON VM 1 item: @@ -32,7 +32,7 @@ brooklyn.catalog: - id: byon2 name: Vagrant BYON VM 2 - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location item: type: byon @@ -43,7 +43,7 @@ brooklyn.catalog: - 10.10.10.102 - id: byon3 - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location name: Vagrant BYON VM 3 item: @@ -55,7 +55,7 @@ brooklyn.catalog: - 10.10.10.103 - id: byon4 - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location name: Vagrant BYON VM 4 item: @@ -67,7 +67,7 @@ brooklyn.catalog: - 10.10.10.104 - id: byon-all - version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location name: Vagrant BYON VM 1-4 item: diff --git a/vagrant/src/main/vagrant/servers.yaml b/vagrant/src/main/vagrant/servers.yaml index 68cfa59c46..28263c887a 100644 --- a/vagrant/src/main/vagrant/servers.yaml +++ b/vagrant/src/main/vagrant/servers.yaml @@ -47,7 +47,7 @@ servers: autocorrect: true shell: env: - BROOKLYN_VERSION: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + BROOKLYN_VERSION: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION INSTALL_FROM_LOCAL_DIST: false cmd: - ssh-keygen -t rsa -N "" -f $HOME/.ssh/id_rsa