Repository: brooklyn-docs Updated Branches: refs/heads/master ad52f8dfa -> 6f8c37bd0
Change version to 0.10.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/6f8c37bd Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/6f8c37bd Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/6f8c37bd Branch: refs/heads/master Commit: 6f8c37bd0ad773021a7e68a8fe6e1d9234ce0234 Parents: ad52f8d Author: Alex Heneveld <[email protected]> Authored: Wed Mar 30 10:59:23 2016 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Mar 30 10:59:23 2016 +0100 ---------------------------------------------------------------------- LICENSE | 2 +- _build/build.sh | 4 ++-- _build/config-guide-version.yml | 4 ++-- _build/javadoc-overview.html | 4 ++-- _config.yml | 2 +- _extra/simple_java_examples/examples.md | 2 +- _plugins/brooklyn_metadata.rb | 2 +- guide/dev/env/maven-build.md | 8 ++++---- guide/dev/tips/debugging-remote-brooklyn.md | 2 +- guide/misc/index.md | 2 +- guide/ops/rest.md | 4 ++-- index.md | 2 +- website/developers/code/index.md | 2 +- .../committers/release-process/environment-variables.md | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index eb2f3d3..ccac2ba 100644 --- a/LICENSE +++ b/LICENSE @@ -286,7 +286,7 @@ This project includes the software: jquery.easy-autocomplete.js Version used: 1.3.1 Used under the following license: The MIT License (http://opensource.org/licenses/MIT) Copyright (c) Åukasz PaweÅczak (2015) - + This project includes the software: jQuery Form Plugin Available at: https://github.com/malsup/form Developed by: Mike Alsup (http://malsup.com/) http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/_build/build.sh ---------------------------------------------------------------------- diff --git a/_build/build.sh b/_build/build.sh index f7a9848..c34543f 100755 --- a/_build/build.sh +++ b/_build/build.sh @@ -22,7 +22,7 @@ function help() { echo "* website-root : to build the website only, in the root" echo "* guide-latest : to build the guide only, in /v/latest/" # BROOKLYN_VERSION_BELOW - echo "* guide-version : to build the guide only, in the versioned namespace /v/0.9.0-SNAPSHOT/" + echo "* guide-version : to build the guide only, in the versioned namespace /v/0.10.0-SNAPSHOT/" echo "* test-guide-root : to build the guide only, in the root (for testing)" echo "* test-both-sub : to build the website to /sub/ and guide to /sub/v/latest/ (for testing)" echo "* original : to build the files in their original location (website it /website and guide in /guide/, for testing)" @@ -74,7 +74,7 @@ function parse_mode() { # Mac bash defaults to v3 not v4, so can't use assoc arrays :( DIRS_TO_MOVE[0]=guide # BROOKLYN_VERSION_BELOW - DIRS_TO_MOVE_TARGET[0]=v/0.9.0-SNAPSHOT + DIRS_TO_MOVE_TARGET[0]=v/0.10.0-SNAPSHOT DIRS_TO_MOVE[1]=style STYLE_SUBDIR=${DIRS_TO_MOVE_TARGET[0]}/style DIRS_TO_MOVE_TARGET[1]=$STYLE_SUBDIR http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/_build/config-guide-version.yml ---------------------------------------------------------------------- diff --git a/_build/config-guide-version.yml b/_build/config-guide-version.yml index 9b910a9..6dadc6f 100644 --- a/_build/config-guide-version.yml +++ b/_build/config-guide-version.yml @@ -1,6 +1,6 @@ path: # BROOKLYN_VERSION_BELOW - guide: /v/0.9.0-SNAPSHOT + guide: /v/0.10.0-SNAPSHOT # BROOKLYN_VERSION_BELOW - style: /v/0.9.0-SNAPSHOT/style + style: /v/0.10.0-SNAPSHOT/style website: "" http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/_build/javadoc-overview.html ---------------------------------------------------------------------- diff --git a/_build/javadoc-overview.html b/_build/javadoc-overview.html index b3f7192..d43d000 100644 --- a/_build/javadoc-overview.html +++ b/_build/javadoc-overview.html @@ -1,7 +1,7 @@ <html><body> <!-- BROOKLYN_VERSION_BELOW --> -Javadoc for <a href="http://brooklyn.io";> Apache Brooklyn</a> 0.9.0-SNAPSHOT +Javadoc for <a href="http://brooklyn.io";> Apache Brooklyn</a> 0.10.0-SNAPSHOT <p> Apache Brooklyn is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License v2.0</a>. @@ -9,7 +9,7 @@ Javadoc for <a href="http://brooklyn.io";> Apache Brooklyn</a> 0.9.0-SNAPSHOT <p> <!-- BROOKLYN_VERSION_BELOW --> -This is the Javadoc for v 0.9.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}. +This is the Javadoc for v 0.10.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}. </p> </body><html> http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/_config.yml ---------------------------------------------------------------------- diff --git a/_config.yml b/_config.yml index 8e32e3b..810c978 100644 --- a/_config.yml +++ b/_config.yml @@ -53,7 +53,7 @@ pdf-rewrite-prefixes: '/website' : '' '/community' : '/community' -brooklyn-version: 0.9.0-SNAPSHOT # BROOKLYN_VERSION +brooklyn-version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION brooklyn-snapshot-git-branch: master # if line above is SNAPSHOT this should point to corresponding git branch (e.g. master, 0.4) # This is auto-detected, but you can override it if needed. http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/_extra/simple_java_examples/examples.md ---------------------------------------------------------------------- diff --git a/_extra/simple_java_examples/examples.md b/_extra/simple_java_examples/examples.md index 32487b7..fa1bcbf 100644 --- a/_extra/simple_java_examples/examples.md +++ b/_extra/simple_java_examples/examples.md @@ -22,7 +22,7 @@ If you have a Maven-based project, integrate this XML fragment with your pom.xml <dependency> <groupId>io.brooklyn</groupId> <artifactId>brooklyn-all</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/_plugins/brooklyn_metadata.rb ---------------------------------------------------------------------- diff --git a/_plugins/brooklyn_metadata.rb b/_plugins/brooklyn_metadata.rb index 303a671..5c08104 100644 --- a/_plugins/brooklyn_metadata.rb +++ b/_plugins/brooklyn_metadata.rb @@ -7,7 +7,7 @@ # module BrooklynMetadata - BROOKLYN_VERSION = "0.9.0-SNAPSHOT" unless defined? BROOKLYN_VERSION + BROOKLYN_VERSION = "0.10.0-SNAPSHOT" unless defined? BROOKLYN_VERSION class Generator < Jekyll::Generator def generate(site) http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/guide/dev/env/maven-build.md ---------------------------------------------------------------------- diff --git a/guide/dev/env/maven-build.md b/guide/dev/env/maven-build.md index 1635397..cda77e3 100644 --- a/guide/dev/env/maven-build.md +++ b/guide/dev/env/maven-build.md @@ -108,7 +108,7 @@ although we'd love to if anyone can help!): [INFO] â maven-assembly-plugin:2.3:single (build-distribution-dir) @ brooklyn-dist â [INFO] Reading assembly descriptor: src/main/config/build-distribution-dir.xml -{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.9.0-SNAPSHOT; it doesn't have an associated file or directory. +{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.10.0-SNAPSHOT; it doesn't have an associated file or directory. [INFO] Copying files to ~/repos/apache/brooklyn/usage/dist/target/brooklyn-dist [WARNING] Assembly file: ~/repos/apache/brooklyn/usage/dist/target/brooklyn-dist is not a regular file (it may be a directory). It cannot be attached to the project build for installation or deployment. @@ -116,9 +116,9 @@ although we'd love to if anyone can help!): [INFO] â maven-assembly-plugin:2.3:single (build-distribution-archive) @ brooklyn-dist â [INFO] Reading assembly descriptor: src/main/config/build-distribution-archive.xml -{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.9.0-SNAPSHOT; it doesn't have an associated file or directory. -{% comment %}BROOKLYN_VERSION{% endcomment %}[INFO] Building tar: /Users/aled/repos/apache/brooklyn/usage/dist/target/brooklyn-0.9.0-SNAPSHOT-dist.tar.gz -{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.9.0-SNAPSHOT; it doesn't have an associated file or directory. +{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.10.0-SNAPSHOT; it doesn't have an associated file or directory. +{% comment %}BROOKLYN_VERSION{% endcomment %}[INFO] Building tar: /Users/aled/repos/apache/brooklyn/usage/dist/target/brooklyn-0.10.0-SNAPSHOT-dist.tar.gz +{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.10.0-SNAPSHOT; it doesn't have an associated file or directory. ... http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/guide/dev/tips/debugging-remote-brooklyn.md ---------------------------------------------------------------------- diff --git a/guide/dev/tips/debugging-remote-brooklyn.md b/guide/dev/tips/debugging-remote-brooklyn.md index 2465f0b..3b4a250 100644 --- a/guide/dev/tips/debugging-remote-brooklyn.md +++ b/guide/dev/tips/debugging-remote-brooklyn.md @@ -25,7 +25,7 @@ This should return details of the build as a JSON string similar to the followin {% highlight json %} { - "version": "0.9.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %} + "version": "0.10.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %} "buildSha1": "c0fdc15291702281acdebf1b11d431a6385f5224", "buildBranch": "UNKNOWN" } http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/guide/misc/index.md ---------------------------------------------------------------------- diff --git a/guide/misc/index.md b/guide/misc/index.md index 6463cf5..b5d9bf8 100644 --- a/guide/misc/index.md +++ b/guide/misc/index.md @@ -1,6 +1,6 @@ --- # BROOKLYN_VERSION_BELOW -title: Other 0.9.0-SNAPSHOT Resources +title: Other 0.10.0-SNAPSHOT Resources layout: website-normal started-pdf-exclude: true children: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/guide/ops/rest.md ---------------------------------------------------------------------- diff --git a/guide/ops/rest.md b/guide/ops/rest.md index c1d7b64..3523815 100644 --- a/guide/ops/rest.md +++ b/guide/ops/rest.md @@ -11,12 +11,12 @@ scheme, but with the `#` at the start of the path removed; for instance the cata item `cluster` in the web console is displayed at: <!-- BROOKLYN_VERSION_BELOW --> - http://localhost:8081/#v1/catalog/entities/cluster:0.9.0-SNAPSHOT + http://localhost:8081/#v1/catalog/entities/cluster:0.10.0-SNAPSHOT And in the REST API it is accessed at: <!-- BROOKLYN_VERSION_BELOW --> - http://localhost:8081/v1/catalog/entities/cluster:0.9.0-SNAPSHOT + http://localhost:8081/v1/catalog/entities/cluster:0.10.0-SNAPSHOT A full reference for the REST API is automatically generated by the server at runtime. It can be found in the Brooklyn web console, under the Script tab. http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/index.md ---------------------------------------------------------------------- diff --git a/index.md b/index.md index 37015c5..a9d3907 100644 --- a/index.md +++ b/index.md @@ -8,7 +8,7 @@ title: Brooklyn Website and Docs (dev build) Consider looking at: * <a href="{{ site.path.website }}/">the brooklyn website</a> -* <a href="{{ site.path.guide }}/">the brooklyn user guide (version 0.9.0-SNAPSHOT) <!-- BROOKLYN_VERSION --></a> +* <a href="{{ site.path.guide }}/">the brooklyn user guide (version 0.10.0-SNAPSHOT) <!-- BROOKLYN_VERSION --></a> Also see the file <code>README.md</code> in this directory. http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/website/developers/code/index.md ---------------------------------------------------------------------- diff --git a/website/developers/code/index.md b/website/developers/code/index.md index a9e566d..ac3bc6d 100644 --- a/website/developers/code/index.md +++ b/website/developers/code/index.md @@ -21,7 +21,7 @@ git submodule foreach 'git checkout master' mvn clean install {% endhighlight %} -This will produce an artifact in `brooklyn-dist/dist/brooklyn-dist-0.9.0-SNAPSHOT-dist.tar.gz` <!-- BROOKLYN_VERSION --> +This will produce an artifact in `brooklyn-dist/dist/brooklyn-dist-0.10.0-SNAPSHOT-dist.tar.gz` <!-- BROOKLYN_VERSION --> which you can use [in the usual way]({{ site.path.guide }}/start/running.html). Some options which may be useful: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6f8c37bd/website/developers/committers/release-process/environment-variables.md ---------------------------------------------------------------------- diff --git a/website/developers/committers/release-process/environment-variables.md b/website/developers/committers/release-process/environment-variables.md index 4ee295d..86e7fe7 100644 --- a/website/developers/committers/release-process/environment-variables.md +++ b/website/developers/committers/release-process/environment-variables.md @@ -9,7 +9,7 @@ releases. To allow these example commands to run unmodified, set these environme {% highlight bash %} # The version currently set on the master branch (BROOKLYN_VERSION_BELOW) -OLD_MASTER_VERSION=0.9.0-SNAPSHOT +OLD_MASTER_VERSION=0.10.0-SNAPSHOT # The next version to be set on the master branch NEW_MASTER_VERSION=0.NNN+1.0-SNAPSHOT
