This is an automated email from the ASF dual-hosted git repository. duncangrant pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
The following commit(s) were added to refs/heads/master by this push: new 1640998 Change version to 1.2.0-SNAPSHOT 1640998 is described below commit 1640998134fce828dbdd95b0f76ef5186c61ad51 Author: Duncan Grant <duncan.gr...@cloudsoft.io> AuthorDate: Tue Jan 30 15:38:22 2024 +0000 Change version to 1.2.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 +- karaf/features/pom.xml | 2 +- .../resources/catalog/catalog-brooklyn-default.bom | 2 +- .../resources/catalog/catalog-brooklyn-software-base.bom | 2 +- .../resources/catalog/catalog-brooklyn-software-brooklyn.bom | 2 +- .../filtered-resources/resources/catalog/catalog-core.bom | 12 ++++++------ .../resources/catalog/catalog-library-software.bom | 4 ++-- .../resources/catalog/catalog-templates-brooklyn-samples.bom | 2 +- .../main/filtered-resources/resources/catalog/catalog.bom | 2 +- .../src/main/resources/resources/etc/default.catalog.bom | 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 +- 32 files changed, 46 insertions(+), 46 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 0f9d3ff..87f6040 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/archetypes/quickstart/NOTES.txt b/archetypes/quickstart/NOTES.txt index f68a529..b345050 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.1.0-SNAPSHOT # BROOKLYN_VERSION + export BV=1.2.0-SNAPSHOT # BROOKLYN_VERSION mvn archetype:generate \ \ diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index 32c6b8a..cb99fe7 100644 --- a/archetypes/quickstart/pom.xml +++ b/archetypes/quickstart/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../brooklyn-server/parent/pom.xml</relativePath> </parent> diff --git a/archetypes/quickstart/src/brooklyn-sample/pom.xml b/archetypes/quickstart/src/brooklyn-sample/pom.xml index 1ac4688..1be25ee 100644 --- a/archetypes/quickstart/src/brooklyn-sample/pom.xml +++ b/archetypes/quickstart/src/brooklyn-sample/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-downstream-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <groupId>com.acme.sample</groupId> diff --git a/deb-packaging/pom.xml b/deb-packaging/pom.xml index b8b14b4..c7906d8 100644 --- a/deb-packaging/pom.xml +++ b/deb-packaging/pom.xml @@ -37,7 +37,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/dist/pom.xml b/dist/pom.xml index 40665c9..e3f39ca 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/dist/src/main/dist/conf/brooklyn/default.catalog.bom b/dist/src/main/dist/conf/brooklyn/default.catalog.bom index b6f7865..7e8c3a3 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.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.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 d67363b..317d56b 100755 --- a/docker-image/pom.xml +++ b/docker-image/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/docker/Makefile b/docker/Makefile index cc35acd..ad54ff9 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -17,7 +17,7 @@ # under the License. # -BROOKLYN_VERSION=1.1.0-SNAPSHOT +BROOKLYN_VERSION=1.2.0-SNAPSHOT default: all diff --git a/docker/brooklyn-docker-start b/docker/brooklyn-docker-start index 42f31c0..cdacc90 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.1.0-SNAPSHOT convenience launcher'${application:+" for ${application}"} + echo 'Apache Brooklyn 1.2.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 4ae4f08..28a8e6b 100644 --- a/downstream-parent/pom.xml +++ b/downstream-parent/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-server</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../brooklyn-server/pom.xml</relativePath> <!-- TODO this uses server root pom as a way to get version info without rat check; it means it inherits apache pom, which might not be desired. diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml index 1843650..a9a9d91 100755 --- a/karaf/apache-brooklyn/pom.xml +++ b/karaf/apache-brooklyn/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-karaf</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml index a2af08e..9772e5a 100644 --- a/karaf/features/pom.xml +++ b/karaf/features/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-karaf</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom index 741eeee..7e06121 100644 --- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom +++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom @@ -16,7 +16,7 @@ # under the License. # brooklyn.catalog: - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION # this is the set of items included by default with Apache Brooklyn, # if referenced by catalog.bom. or the catalog.bom can be replaced entirely. diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-base.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-base.bom index 7289cb6..0a5ff28 100644 --- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-base.bom +++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-base.bom @@ -16,7 +16,7 @@ # under the License. brooklyn.catalog: - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION itemType: entity items: - id: org.apache.brooklyn.entity.machine.MachineEntity diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-brooklyn.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-brooklyn.bom index 4ee7073..727c770 100644 --- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-brooklyn.bom +++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-brooklyn.bom @@ -16,7 +16,7 @@ # under the License. brooklyn.catalog: - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION itemType: entity items: - id: org.apache.brooklyn.entity.brooklynnode.BrooklynNode diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom index 675d769..1cd0bd0 100644 --- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom +++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom @@ -16,20 +16,20 @@ # under the License. # brooklyn.catalog: - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION brooklyn.libraries: # very common building blocks - - mvn:org.apache.brooklyn/brooklyn-core/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-policy/1.1.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-core/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-policy/1.2.0-SNAPSHOT # BROOKLYN_VERSION # often useful server-related entities - - mvn:org.apache.brooklyn/brooklyn-software-base/1.1.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-base/1.2.0-SNAPSHOT # BROOKLYN_VERSION # possibly useful test entities - - mvn:org.apache.brooklyn/brooklyn-test-framework/1.1.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-test-framework/1.2.0-SNAPSHOT # BROOKLYN_VERSION # convenient aliases for common things - - mvn:org.apache.brooklyn/brooklyn-karaf-init/1.1.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-karaf-init/1.2.0-SNAPSHOT # BROOKLYN_VERSION diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-library-software.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-library-software.bom index 8932e61..7f8822b 100644 --- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-library-software.bom +++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-library-software.bom @@ -16,10 +16,10 @@ # under the License. # brooklyn.catalog: - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION brooklyn.libraries: # possibly useful blueprints for common software (but often users will want to replace) - - mvn:org.apache.brooklyn/brooklyn-library-catalog/1.1.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-library-catalog/1.2.0-SNAPSHOT # BROOKLYN_VERSION diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-templates-brooklyn-samples.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-templates-brooklyn-samples.bom index 66741c0..010f35c 100644 --- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-templates-brooklyn-samples.bom +++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-templates-brooklyn-samples.bom @@ -16,7 +16,7 @@ # under the License. # brooklyn.catalog: - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION items: - id: 1-server-template diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom index 851a7ba..ca99c6d 100644 --- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom +++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom @@ -16,7 +16,7 @@ # under the License. # brooklyn.catalog: - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION items: - 'file:catalog/catalog-brooklyn-default.bom' diff --git a/karaf/features/src/main/resources/resources/etc/default.catalog.bom b/karaf/features/src/main/resources/resources/etc/default.catalog.bom index 7964de1..36bae9f 100644 --- a/karaf/features/src/main/resources/resources/etc/default.catalog.bom +++ b/karaf/features/src/main/resources/resources/etc/default.catalog.bom @@ -4,7 +4,7 @@ brooklyn.catalog: bundle: brooklyn-default-karaf-catalog - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION catalog.osgi.wrap.headers: # when this is wrapped to produce a bundle, insert these headers so previous persisted default catalogs are replaced Brooklyn-Catalog-Force-Remove-Bundles: "*" diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml index cbdfe28..6a149c4 100644 --- a/karaf/itest/pom.xml +++ b/karaf/itest/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-karaf</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/karaf/pom.xml b/karaf/pom.xml index 4a1398f..a71b282 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -33,7 +33,7 @@ <!-- if this depends (via inheritance from brooklyn-dist) on brooklyn-server/parent, the usual parent point, then karaf-itest has failures --> <artifactId>brooklyn-server</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../brooklyn-server/pom.xml</relativePath> </parent> diff --git a/pom.xml b/pom.xml index ef2558e..ff626eb 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../brooklyn-server/parent/pom.xml</relativePath> </parent> diff --git a/rpm-packaging/pom.xml b/rpm-packaging/pom.xml index e1c0257..3abfe73 100644 --- a/rpm-packaging/pom.xml +++ b/rpm-packaging/pom.xml @@ -37,7 +37,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/shared-packaging/pom.xml b/shared-packaging/pom.xml index 0785cd4..52ec456 100644 --- a/shared-packaging/pom.xml +++ b/shared-packaging/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/shared-packaging/src/test/yaml/package-apps.yaml b/shared-packaging/src/test/yaml/package-apps.yaml index 12599f7..89be9f2 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/<private key> user: ubuntu brooklyn.config: - package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/1.1.0-SNAPSHOT/deb-packaging-1.1.0-SNAPSHOT-all.deb # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/1.2.0-SNAPSHOT/deb-packaging-1.2.0-SNAPSHOT-all.deb # BROOKLYN_VERSION --- @@ -38,7 +38,7 @@ services: # privateKeyFile: ~/.ssh/<private key> user: vagrant brooklyn.config: - package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/1.1.0-SNAPSHOT/deb-packaging-1.1.0-SNAPSHOT-all.deb # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/1.2.0-SNAPSHOT/deb-packaging-1.2.0-SNAPSHOT-all.deb # BROOKLYN_VERSION --- @@ -51,7 +51,7 @@ services: # privateKeyFile: ~/.ssh/<private key> user: vagrant brooklyn.config: - package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/1.1.0-SNAPSHOT/rpm-packaging-1.1.0-SNAPSHOT-noarch.rpm # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/1.2.0-SNAPSHOT/rpm-packaging-1.2.0-SNAPSHOT-noarch.rpm # BROOKLYN_VERSION --- @@ -64,6 +64,6 @@ services: # privateKeyFile: ~/.ssh/<private key> user: vagrant brooklyn.config: - package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/1.1.0-SNAPSHOT/rpm-packaging-1.1.0-SNAPSHOT-noarch.rpm # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/1.2.0-SNAPSHOT/rpm-packaging-1.2.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 83ae697..8c328a4 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.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION items: - id: systemd-brooklyn diff --git a/vagrant/pom.xml b/vagrant/pom.xml index 139f1cb..a1aeeea 100644 --- a/vagrant/pom.xml +++ b/vagrant/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/vagrant/src/main/vagrant/README.md b/vagrant/src/main/vagrant/README.md index fb58ecb..f715f59 100644 --- a/vagrant/src/main/vagrant/README.md +++ b/vagrant/src/main/vagrant/README.md @@ -8,7 +8,7 @@ ``` env: - BROOKLYN_VERSION: 1.1.0-SNAPSHOT + BROOKLYN_VERSION: 1.2.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.1.0-SNAPSHOT + BROOKLYN_VERSION: 1.2.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 89b62ae..daf1e24 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.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.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.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location item: type: byon @@ -43,7 +43,7 @@ brooklyn.catalog: - 10.10.10.102 - id: byon3 - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.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.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.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.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.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 28263c8..ec738ae 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.1.0-SNAPSHOT" # BROOKLYN_VERSION + BROOKLYN_VERSION: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION INSTALL_FROM_LOCAL_DIST: false cmd: - ssh-keygen -t rsa -N "" -f $HOME/.ssh/id_rsa