Repository: brooklyn-dist Updated Branches: refs/heads/master d2cd2df96 -> dc5b609d8
Bump version to 0.12.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/dc5b609d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/dc5b609d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/dc5b609d Branch: refs/heads/master Commit: dc5b609d8899d12b8547b732107ec323428f5789 Parents: d2cd2df Author: Richard Downer <[email protected]> Authored: Tue Apr 11 15:14:00 2017 +0000 Committer: Richard Downer <[email protected]> Committed: Tue Apr 11 15:14:00 2017 +0000 ---------------------------------------------------------------------- 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 +- 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 +- 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 +- 24 files changed, 32 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/all/pom.xml ---------------------------------------------------------------------- diff --git a/all/pom.xml b/all/pom.xml index 848f689..38eac82 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/archetypes/quickstart/NOTES.txt ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/NOTES.txt b/archetypes/quickstart/NOTES.txt index 14002ee..63364b4 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=0.11.0-SNAPSHOT # BROOKLYN_VERSION + export BV=0.12.0-SNAPSHOT # BROOKLYN_VERSION mvn archetype:generate \ \ http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/archetypes/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml index 0ee0338..5642b00 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../brooklyn-server/parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/archetypes/quickstart/src/brooklyn-sample/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/brooklyn-sample/pom.xml b/archetypes/quickstart/src/brooklyn-sample/pom.xml index 46fc6e3..c5c6590 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <groupId>com.acme.sample</groupId> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/deb-packaging/pom.xml ---------------------------------------------------------------------- diff --git a/deb-packaging/pom.xml b/deb-packaging/pom.xml index cb33151..a6e5611 100644 --- a/deb-packaging/pom.xml +++ b/deb-packaging/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/dist/pom.xml ---------------------------------------------------------------------- diff --git a/dist/pom.xml b/dist/pom.xml index 7554b3d..8ade914 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/docker/Makefile ---------------------------------------------------------------------- diff --git a/docker/Makefile b/docker/Makefile index d916db4..f0e9ce5 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -17,7 +17,7 @@ # under the License. # -BROOKLYN_VERSION=0.11.0-SNAPSHOT +BROOKLYN_VERSION=0.12.0-SNAPSHOT default: all http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/docker/brooklyn-docker-start ---------------------------------------------------------------------- diff --git a/docker/brooklyn-docker-start b/docker/brooklyn-docker-start index 33cf08d..561c2b6 100755 --- a/docker/brooklyn-docker-start +++ b/docker/brooklyn-docker-start @@ -33,7 +33,7 @@ function help() { echo # BROOKLYN_VERSION_BELOW - echo 'Apache Brooklyn 0.11.0-SNAPSHOT convenience launcher'${application:+" for ${application}"} + echo 'Apache Brooklyn 0.12.0-SNAPSHOT convenience launcher'${application:+" for ${application}"} echo echo 'Usage: [OPTIONS] [--help | LOCATION | COMMAND] [ARGS]' echo http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/downstream-parent/pom.xml ---------------------------------------------------------------------- diff --git a/downstream-parent/pom.xml b/downstream-parent/pom.xml index e17c89e..709399c 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.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. http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/karaf/apache-brooklyn/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml index 4cdaa30..9e78ef5 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom ---------------------------------------------------------------------- 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 fa67180..8a0e705 100644 --- a/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom +++ b/karaf/apache-brooklyn/src/main/resources/etc/default.catalog.bom @@ -3,7 +3,7 @@ # and templates to get started using Brooklyn brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION include: classpath://library-catalog-classes.bom items: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/karaf/config/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/config/pom.xml b/karaf/config/pom.xml index 9cf71f8..9fbfad0 100644 --- a/karaf/config/pom.xml +++ b/karaf/config/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>brooklyn-dist-karaf</artifactId> <groupId>org.apache.brooklyn</groupId> - <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml index 0c876b6..291ed22 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/karaf/itest/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml index 4b4cd66..b11d783 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/karaf/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/pom.xml b/karaf/pom.xml index e34efa8..e9fc48c 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../brooklyn-server/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ddb50f0..e65366c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../brooklyn-server/parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/rpm-packaging/pom.xml ---------------------------------------------------------------------- diff --git a/rpm-packaging/pom.xml b/rpm-packaging/pom.xml index df1a1a0..b2b7075 100644 --- a/rpm-packaging/pom.xml +++ b/rpm-packaging/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/shared-packaging/pom.xml ---------------------------------------------------------------------- diff --git a/shared-packaging/pom.xml b/shared-packaging/pom.xml index 82a575f..83dc480 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/shared-packaging/src/test/yaml/package-apps.yaml ---------------------------------------------------------------------- diff --git a/shared-packaging/src/test/yaml/package-apps.yaml b/shared-packaging/src/test/yaml/package-apps.yaml index 1866e40..de4420c 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: vagrant brooklyn.config: - package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.11.0-SNAPSHOT/deb-packaging-0.11.0-SNAPSHOT.deb # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.12.0-SNAPSHOT/deb-packaging-0.12.0-SNAPSHOT.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/0.11.0-SNAPSHOT/deb-packaging-0.11.0-SNAPSHOT.deb # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/deb-packaging/0.12.0-SNAPSHOT/deb-packaging-0.12.0-SNAPSHOT.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/0.11.0-SNAPSHOT/rpm-packaging-0.11.0-SNAPSHOT.rpm # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/0.12.0-SNAPSHOT/rpm-packaging-0.12.0-SNAPSHOT.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/0.11.0-SNAPSHOT/rpm-packaging-0.11.0-SNAPSHOT.rpm # BROOKLYN_VERSION + package.file: ~/.m2/repository/org/apache/brooklyn/rpm-packaging/0.12.0-SNAPSHOT/rpm-packaging-0.12.0-SNAPSHOT.rpm # BROOKLYN_VERSION http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/shared-packaging/src/test/yaml/package.bom ---------------------------------------------------------------------- diff --git a/shared-packaging/src/test/yaml/package.bom b/shared-packaging/src/test/yaml/package.bom index 26d19f0..c17cb2c 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: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION items: - id: systemd-brooklyn http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/vagrant/pom.xml ---------------------------------------------------------------------- diff --git a/vagrant/pom.xml b/vagrant/pom.xml index 4ab81a1..6096db6 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>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/vagrant/src/main/vagrant/README.md ---------------------------------------------------------------------- diff --git a/vagrant/src/main/vagrant/README.md b/vagrant/src/main/vagrant/README.md index af2d6c4..fb9e2fe 100644 --- a/vagrant/src/main/vagrant/README.md +++ b/vagrant/src/main/vagrant/README.md @@ -8,7 +8,7 @@ ``` env: - BROOKLYN_VERSION: 0.11.0-SNAPSHOT + BROOKLYN_VERSION: 0.12.0-SNAPSHOT ``` 2. You may proceed to use the `Vagrantfile` as normal; `vagrant up`, `vagrant destroy` etc. @@ -19,7 +19,7 @@ ``` env: - BROOKLYN_VERSION: 0.11.0-SNAPSHOT + BROOKLYN_VERSION: 0.12.0-SNAPSHOT ``` 2. Set the `INSTALL_FROM_LOCAL_DIST:` environment variable in `servers.yaml` to `true`. For example: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/vagrant/src/main/vagrant/files/vagrant-catalog.bom ---------------------------------------------------------------------- diff --git a/vagrant/src/main/vagrant/files/vagrant-catalog.bom b/vagrant/src/main/vagrant/files/vagrant-catalog.bom index 5d4da4d..1d2a1da 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: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.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: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location item: type: byon @@ -43,7 +43,7 @@ brooklyn.catalog: - 10.10.10.102 - id: byon3 - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.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: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.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: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION itemType: location name: Vagrant BYON VM 1-4 item: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc5b609d/vagrant/src/main/vagrant/servers.yaml ---------------------------------------------------------------------- diff --git a/vagrant/src/main/vagrant/servers.yaml b/vagrant/src/main/vagrant/servers.yaml index e3d974f..e343eb4 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: "0.11.0-SNAPSHOT" + BROOKLYN_VERSION: "0.12.0-SNAPSHOT" INSTALL_FROM_LOCAL_DIST: false cmd: - ssh-keygen -t rsa -N "" -f $HOME/.ssh/id_rsa
