You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/12/04 16:40:13 UTC
[1/2] brooklyn-docs git commit: Change version to 0.11.0-SNAPSHOT
Repository: brooklyn-docs
Updated Branches:
refs/heads/master 78c19d284 -> 2c002ce69
Change version to 0.11.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/3d3bc814
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/3d3bc814
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/3d3bc814
Branch: refs/heads/master
Commit: 3d3bc814253f05e7fc304abc29ca928eca814eea
Parents: 78c19d2
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Sun Dec 4 16:32:08 2016 +0000
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Sun Dec 4 16:32:08 2016 +0000
----------------------------------------------------------------------
_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 +-
13 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3d3bc814/_build/build.sh
----------------------------------------------------------------------
diff --git a/_build/build.sh b/_build/build.sh
index c34543f..cb631ac 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.10.0-SNAPSHOT/"
+ echo "* guide-version : to build the guide only, in the versioned namespace /v/0.11.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.10.0-SNAPSHOT
+ DIRS_TO_MOVE_TARGET[0]=v/0.11.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/3d3bc814/_build/config-guide-version.yml
----------------------------------------------------------------------
diff --git a/_build/config-guide-version.yml b/_build/config-guide-version.yml
index 6dadc6f..c7e8e28 100644
--- a/_build/config-guide-version.yml
+++ b/_build/config-guide-version.yml
@@ -1,6 +1,6 @@
path:
# BROOKLYN_VERSION_BELOW
- guide: /v/0.10.0-SNAPSHOT
+ guide: /v/0.11.0-SNAPSHOT
# BROOKLYN_VERSION_BELOW
- style: /v/0.10.0-SNAPSHOT/style
+ style: /v/0.11.0-SNAPSHOT/style
website: ""
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3d3bc814/_build/javadoc-overview.html
----------------------------------------------------------------------
diff --git a/_build/javadoc-overview.html b/_build/javadoc-overview.html
index d43d000..5f2de7f 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.10.0-SNAPSHOT
+Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 0.11.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.10.0-SNAPSHOT
<p>
<!-- BROOKLYN_VERSION_BELOW -->
-This is the Javadoc for v 0.10.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}.
+This is the Javadoc for v 0.11.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}.
</p>
</body><html>
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3d3bc814/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 09ef041..03a028e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -54,7 +54,7 @@ pdf-rewrite-prefixes:
'/guide' : '/v/0.9.0'
'/website' : ''
-brooklyn-version: 0.10.0-SNAPSHOT # BROOKLYN_VERSION
+brooklyn-version: 0.11.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/3d3bc814/_extra/simple_java_examples/examples.md
----------------------------------------------------------------------
diff --git a/_extra/simple_java_examples/examples.md b/_extra/simple_java_examples/examples.md
index fa1bcbf..6a8ca7f 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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3d3bc814/_plugins/brooklyn_metadata.rb
----------------------------------------------------------------------
diff --git a/_plugins/brooklyn_metadata.rb b/_plugins/brooklyn_metadata.rb
index c210c3d..15ee87e 100644
--- a/_plugins/brooklyn_metadata.rb
+++ b/_plugins/brooklyn_metadata.rb
@@ -7,7 +7,7 @@
#
module BrooklynMetadata
- BROOKLYN_VERSION = "0.10.0-SNAPSHOT" unless defined? BROOKLYN_VERSION
+ BROOKLYN_VERSION = "0.11.0-SNAPSHOT" unless defined? BROOKLYN_VERSION
class Generator < Jekyll::Generator
def generate(site)
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3d3bc814/guide/dev/env/maven-build.md
----------------------------------------------------------------------
diff --git a/guide/dev/env/maven-build.md b/guide/dev/env/maven-build.md
index e311b8f..1c95dd9 100644
--- a/guide/dev/env/maven-build.md
+++ b/guide/dev/env/maven-build.md
@@ -115,7 +115,7 @@ although we'd love to if anyone can help!):
[INFO] \u2014 maven-assembly-plugin:2.3:single (build-distribution-dir) @ brooklyn-dist \u2014
[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.10.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.11.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.
@@ -123,9 +123,9 @@ although we'd love to if anyone can help!):
[INFO] \u2014 maven-assembly-plugin:2.3:single (build-distribution-archive) @ brooklyn-dist \u2014
[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.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.
+{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.11.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.11.0-SNAPSHOT-dist.tar.gz
+{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.11.0-SNAPSHOT; it doesn't have an associated file or directory.
...
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3d3bc814/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 3b4a250..9b0c1bb 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.10.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %}
+ "version": "0.11.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %}
"buildSha1": "c0fdc15291702281acdebf1b11d431a6385f5224",
"buildBranch": "UNKNOWN"
}
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3d3bc814/guide/misc/index.md
----------------------------------------------------------------------
diff --git a/guide/misc/index.md b/guide/misc/index.md
index b5d9bf8..a90efbb 100644
--- a/guide/misc/index.md
+++ b/guide/misc/index.md
@@ -1,6 +1,6 @@
---
# BROOKLYN_VERSION_BELOW
-title: Other 0.10.0-SNAPSHOT Resources
+title: Other 0.11.0-SNAPSHOT Resources
layout: website-normal
started-pdf-exclude: true
children:
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3d3bc814/guide/ops/rest.md
----------------------------------------------------------------------
diff --git a/guide/ops/rest.md b/guide/ops/rest.md
index 3523815..22e251b 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.10.0-SNAPSHOT
+ http://localhost:8081/#v1/catalog/entities/cluster:0.11.0-SNAPSHOT
And in the REST API it is accessed at:
<!-- BROOKLYN_VERSION_BELOW -->
- http://localhost:8081/v1/catalog/entities/cluster:0.10.0-SNAPSHOT
+ http://localhost:8081/v1/catalog/entities/cluster:0.11.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/3d3bc814/index.md
----------------------------------------------------------------------
diff --git a/index.md b/index.md
index a9d3907..2ac3e1a 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.10.0-SNAPSHOT) <!-- BROOKLYN_VERSION --></a>
+* <a href="{{ site.path.guide }}/">the brooklyn user guide (version 0.11.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/3d3bc814/website/developers/code/index.md
----------------------------------------------------------------------
diff --git a/website/developers/code/index.md b/website/developers/code/index.md
index ac3bc6d..6543c35 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.10.0-SNAPSHOT-dist.tar.gz` <!-- BROOKLYN_VERSION -->
+This will produce an artifact in `brooklyn-dist/dist/brooklyn-dist-0.11.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/3d3bc814/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 5ba0646..34483c8 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.10.0-SNAPSHOT
+OLD_MASTER_VERSION=0.11.0-SNAPSHOT
# The next version to be set on the master branch
NEW_MASTER_VERSION=0.10.0-SNAPSHOT
[2/2] brooklyn-docs git commit: Update release-notes.md and
versions.md for new working version
Posted by sv...@apache.org.
Update release-notes.md and versions.md for new working version
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/2c002ce6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/2c002ce6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/2c002ce6
Branch: refs/heads/master
Commit: 2c002ce6918f23253f0c352f22644bdd2e1d0ecc
Parents: 3d3bc81
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Sun Dec 4 16:38:23 2016 +0000
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Sun Dec 4 16:38:23 2016 +0000
----------------------------------------------------------------------
guide/misc/release-notes.md | 20 ++------------------
website/meta/versions.md | 11 ++++++++++-
2 files changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2c002ce6/guide/misc/release-notes.md
----------------------------------------------------------------------
diff --git a/guide/misc/release-notes.md b/guide/misc/release-notes.md
index e196c47..ebd894d 100644
--- a/guide/misc/release-notes.md
+++ b/guide/misc/release-notes.md
@@ -19,24 +19,8 @@ to Brooklyn's commercial users for funding much of this development.
Changes since 0.9.0:
-1. [minor] `ClassCoercionException` has moved package. The old one was deleted to prevent errors inadvertently trying to catch it.
-
-2. [minor] Default config key values are now coerced to the right type when accessed.
-Previously coercion only applied to values set, so if a default value was accessed, the caller would get the
-value and type of the default value, not coerced to the type of the config key.
-This was inconsistent with cases where a value is set for the config key, as callers in that case will get the
-value coerced to the type of the config key. This was a bug as callers should always be able to expect
-the config value to be of the declared type, consistently across default values and explicitly set values.
-
- As an example, if a config key is typed (e.g. `port`) and a caller uses code such as `$brooklyn:config` to access
-that value, previously they would see the numeric value if the value comes from a default;
-if that is what is being expected it is an error as a JSON map for `PortRange` would be returned if a config value is set,
-but the erroneous usage might not have been noticed if the port only ever came from a default value.
-The fix in this case is to use `$brooklyn:attributeWhenReady` if the caller wants the actual value selected from the range
-(through port inferencing done e.g. in `SoftwareProcess` entities),
-or to declare the sensor of type `int` if they do not want port ranges and inferencing to be supported.
-
+1. ...
For changes in prior versions, please refer to the release notes for
-[0.9.0]({{ site.path.v }}/0.9.0/misc/release-notes.html).
+[0.10.0]({{ site.path.v }}/0.10.0/misc/release-notes.html).
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2c002ce6/website/meta/versions.md
----------------------------------------------------------------------
diff --git a/website/meta/versions.md b/website/meta/versions.md
index a23cb20..f78825f 100644
--- a/website/meta/versions.md
+++ b/website/meta/versions.md
@@ -19,6 +19,9 @@ This documentation was generated {{ site.time | date_to_string }}.
Apache Brooklyn has made the following releases:
+* **[0.10.0](/v/0.10.0/)**: Adds Brooklyn CLI client, RPM package, getting started
+ using Vagrant. First release as an Apache top-level project! (December 2016)
+
* **[0.9.0](/v/0.9.0/)**: Adds Brooklyn CLI client, RPM package, getting started
using Vagrant. First release as an Apache top-level project! (April 2016)
@@ -45,7 +48,13 @@ This code has not been voted on and are not endorsed by The Apache Software Foun
Documentation for these versions are uploaded from time to time,
and are provided here for reference:
-* **[0.9.0-SNAPSHOT](/v/0.9.0-SNAPSHOT/)**: latest unreleased version
+* **[0.11.0-SNAPSHOT](/v/0.11.0-SNAPSHOT/)**: latest unreleased version
+(although docs may not be up-to-date with the latest code)
+
+* **[0.10.0-SNAPSHOT](/v/0.10.0-SNAPSHOT/)**: any changes since 0.10.0 which would go into 0.10.1
+(although docs may not be up-to-date with the latest code)
+
+* **[0.9.0-SNAPSHOT](/v/0.9.0-SNAPSHOT/)**: any changes since 0.9.0 which would go into 0.9.1
(although docs may not be up-to-date with the latest code)
* **[0.8.0-SNAPSHOT](/v/0.8.0-SNAPSHOT/)**: any changes since 0.8.0-incubating which would go into 0.8.1