You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2021/09/17 12:44:08 UTC
[brooklyn-docs] branch master updated (b64b091 -> 1128aed)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git.
from b64b091 Merge branch 'master' of https://gitbox.apache.org/repos/asf/brooklyn-docs
new 1b524bf add marker for version
new 1128aed bump brooklyn version to 1.1.0-SNAPSHOT to match other projects
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
_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 +-
index.md | 2 +-
website/developers/code/index.md | 2 +-
.../developers/committers/release-process/environment-variables.md | 4 ++--
9 files changed, 13 insertions(+), 13 deletions(-)
[brooklyn-docs] 01/02: add marker for version
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
commit 1b524bf9149f517a178314dd489032abb42c6b00
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Sep 17 13:42:17 2021 +0100
add marker for version
---
_config.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_config.yml b/_config.yml
index 8feb5c7..d5492e2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -65,7 +65,7 @@ pdf-rewrite-prefixes:
'/guide' : '/v/0.12.0'
'/website' : ''
-brooklyn-version: 1.0.0-SNAPSHOT # BROOKLYN_VERSION
+brooklyn-version: 1.0.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.
[brooklyn-docs] 02/02: bump brooklyn version to 1.1.0-SNAPSHOT to
match other projects
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
commit 1128aed3840dd239aba9ef30ba4d8a5a4499710e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Sep 17 13:43:52 2021 +0100
bump brooklyn version to 1.1.0-SNAPSHOT to match other projects
---
_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 +-
index.md | 2 +-
website/developers/code/index.md | 2 +-
.../developers/committers/release-process/environment-variables.md | 4 ++--
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/_build/build.sh b/_build/build.sh
index b5674b9..889eab4 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.0.0-SNAPSHOT/"
+ echo "* guide-version : to build the guide only, in the versioned namespace /v/1.1.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.0.0-SNAPSHOT
+ DIRS_TO_MOVE_TARGET[0]=v/1.1.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 b3b5c17..e4be68d 100644
--- a/_build/config-guide-version.yml
+++ b/_build/config-guide-version.yml
@@ -1,6 +1,6 @@
path:
# BROOKLYN_VERSION_BELOW
- guide: /v/1.0.0-SNAPSHOT
+ guide: /v/1.1.0-SNAPSHOT
# BROOKLYN_VERSION_BELOW
- style: /v/1.0.0-SNAPSHOT/style
+ style: /v/1.1.0-SNAPSHOT/style
website: ""
diff --git a/_build/javadoc-overview.html b/_build/javadoc-overview.html
index 1a5d50d..4add25b 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.0.0-SNAPSHOT
+Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 1.1.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.0.0-SNAPSHOT
<p>
<!-- BROOKLYN_VERSION_BELOW -->
-This is the Javadoc for v 1.0.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}.
+This is the Javadoc for v 1.1.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}.
</p>
</body><html>
diff --git a/_config.yml b/_config.yml
index d5492e2..930f7a2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -65,7 +65,7 @@ pdf-rewrite-prefixes:
'/guide' : '/v/0.12.0'
'/website' : ''
-brooklyn-version: 1.0.0-SNAPSHOT # BROOKLYN_VERSION brooklyn-docs-version
+brooklyn-version: 1.1.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 72278b2..353e1b4 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.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
</dependency>
</dependencies>
diff --git a/_plugins/brooklyn_metadata.rb b/_plugins/brooklyn_metadata.rb
index 2daf913..77ea79f 100644
--- a/_plugins/brooklyn_metadata.rb
+++ b/_plugins/brooklyn_metadata.rb
@@ -7,7 +7,7 @@
#
module BrooklynMetadata
- BROOKLYN_VERSION = "1.0.0-SNAPSHOT" unless defined? BROOKLYN_VERSION
+ BROOKLYN_VERSION = "1.1.0-SNAPSHOT" unless defined? BROOKLYN_VERSION
class Generator < Jekyll::Generator
def generate(site)
diff --git a/index.md b/index.md
index 00ec70b..c2fe705 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.0.0-SNAPSHOT)](guide/) <span> <!-- BROOKLYN_VERSION --> </span>
+* [the brooklyn user guide (version 1.1.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 3b382c5..35fde78 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.0.0-SNAPSHOT-dist.tar.gz` <!-- BROOKLYN_VERSION -->
+This will produce an artifact in `brooklyn-dist/dist/brooklyn-dist-1.1.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 d99473b..1916fb4 100644
--- a/website/developers/committers/release-process/environment-variables.md
+++ b/website/developers/committers/release-process/environment-variables.md
@@ -9,9 +9,9 @@ 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.0.0-SNAPSHOT
+OLD_MASTER_VERSION=1.1.0-SNAPSHOT
# The next version to be set on the master branch
-NEW_MASTER_VERSION=1.1.0-SNAPSHOT
+NEW_MASTER_VERSION=9.9.9-SNAPSHOT
# The version we are releasing now.
VERSION_NAME=1.0.0