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-docs.git
commit 528999db51bde50f71a20a38fa7acc098b401062 Author: Duncan Grant <duncan.gr...@cloudsoft.io> AuthorDate: Tue Jan 30 15:38:22 2024 +0000 Change version to 1.2.0-SNAPSHOT --- _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/tips/debugging-remote-brooklyn.md | 2 +- guide/ops/rest.md | 4 ++-- index.md | 2 +- website/developers/code/index.md | 2 +- .../developers/committers/release-process/environment-variables.md | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/_build/build.sh b/_build/build.sh index a51d9849..b04debfe 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/1.1.0-SNAPSHOT/" + echo "* guide-version : to build the guide only, in the versioned namespace /v/1.2.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/1.1.0-SNAPSHOT + DIRS_TO_MOVE_TARGET[0]=v/1.2.0-SNAPSHOT DIRS_TO_MOVE[1]=style STYLE_SUBDIR=${DIRS_TO_MOVE_TARGET[0]}/style DIRS_TO_MOVE_TARGET[1]=$STYLE_SUBDIR diff --git a/_build/config-guide-version.yml b/_build/config-guide-version.yml index e4be68d8..331f458a 100644 --- a/_build/config-guide-version.yml +++ b/_build/config-guide-version.yml @@ -1,6 +1,6 @@ path: # BROOKLYN_VERSION_BELOW - guide: /v/1.1.0-SNAPSHOT + guide: /v/1.2.0-SNAPSHOT # BROOKLYN_VERSION_BELOW - style: /v/1.1.0-SNAPSHOT/style + style: /v/1.2.0-SNAPSHOT/style website: "" diff --git a/_build/javadoc-overview.html b/_build/javadoc-overview.html index 4add25bc..eaf7e396 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> 1.1.0-SNAPSHOT +Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 1.2.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> 1.1.0-SNAPSHOT <p> <!-- BROOKLYN_VERSION_BELOW --> -This is the Javadoc for v 1.1.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}. +This is the Javadoc for v 1.2.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}. </p> </body><html> diff --git a/_config.yml b/_config.yml index 930f7a2b..4f93f65e 100644 --- a/_config.yml +++ b/_config.yml @@ -65,7 +65,7 @@ pdf-rewrite-prefixes: '/guide' : '/v/0.12.0' '/website' : '' -brooklyn-version: 1.1.0-SNAPSHOT # BROOKLYN_VERSION brooklyn-docs-version +brooklyn-version: 1.2.0-SNAPSHOT # BROOKLYN_VERSION brooklyn-docs-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. diff --git a/_extra/simple_java_examples/examples.md b/_extra/simple_java_examples/examples.md index 353e1b4b..e20284f6 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </dependency> </dependencies> diff --git a/_plugins/brooklyn_metadata.rb b/_plugins/brooklyn_metadata.rb index 77ea79fa..9b40b5a3 100644 --- a/_plugins/brooklyn_metadata.rb +++ b/_plugins/brooklyn_metadata.rb @@ -7,7 +7,7 @@ # module BrooklynMetadata - BROOKLYN_VERSION = "1.1.0-SNAPSHOT" unless defined? BROOKLYN_VERSION + BROOKLYN_VERSION = "1.2.0-SNAPSHOT" unless defined? BROOKLYN_VERSION class Generator < Jekyll::Generator def generate(site) diff --git a/guide/dev/tips/debugging-remote-brooklyn.md b/guide/dev/tips/debugging-remote-brooklyn.md index 84c305e7..f688c18f 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": "1.1.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %} + "version": "1.2.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %} "buildSha1": "c0fdc15291702281acdebf1b11d431a6385f5224", "buildBranch": "UNKNOWN" } diff --git a/guide/ops/rest.md b/guide/ops/rest.md index c0bc5039..cf96c104 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:1.1.0-SNAPSHOT + http://localhost:8081/#v1/catalog/entities/cluster:1.2.0-SNAPSHOT And in the REST API it is accessed at: <!-- BROOKLYN_VERSION_BELOW --> - http://localhost:8081/v1/catalog/entities/cluster:1.1.0-SNAPSHOT + http://localhost:8081/v1/catalog/entities/cluster:1.2.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. diff --git a/index.md b/index.md index c2fe7057..8b6589bb 100644 --- a/index.md +++ b/index.md @@ -8,7 +8,7 @@ title: Brooklyn Website and Docs (dev build) Consider looking at: * [the brooklyn website](/website/) -* [the brooklyn user guide (version 1.1.0-SNAPSHOT)](guide/) <span> <!-- BROOKLYN_VERSION --> </span> +* [the brooklyn user guide (version 1.2.0-SNAPSHOT)](guide/) <span> <!-- BROOKLYN_VERSION --> </span> Also see the file <code>README.md</code> in this directory. diff --git a/website/developers/code/index.md b/website/developers/code/index.md index 35fde789..ee8499a6 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-1.1.0-SNAPSHOT-dist.tar.gz` <!-- BROOKLYN_VERSION --> +This will produce an artifact in `brooklyn-dist/dist/brooklyn-dist-1.2.0-SNAPSHOT-dist.tar.gz` <!-- BROOKLYN_VERSION --> which you can use [in the usual way](/guide/start/running.html). Some options which may be useful: diff --git a/website/developers/committers/release-process/environment-variables.md b/website/developers/committers/release-process/environment-variables.md index 1916fb4c..93758b67 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=1.1.0-SNAPSHOT +OLD_MASTER_VERSION=1.2.0-SNAPSHOT # The next version to be set on the master branch NEW_MASTER_VERSION=9.9.9-SNAPSHOT