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 2015/09/02 14:30:43 UTC

[01/11] incubator-brooklyn git commit: use closer.lua not closer.cgi for apache mirror links

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 23f7951c2 -> 81f2e376c


use closer.lua not closer.cgi for apache mirror links

this is what cassandra for instance does, it means the mirror site can follow links.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bcb2d52f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bcb2d52f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bcb2d52f

Branch: refs/heads/master
Commit: bcb2d52fc3f229647cebada32f50477467d20e67
Parents: 48d0624
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 2 08:46:45 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 2 09:22:44 2015 +0100

----------------------------------------------------------------------
 docs/website/download/index.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bcb2d52f/docs/website/download/index.md
----------------------------------------------------------------------
diff --git a/docs/website/download/index.md b/docs/website/download/index.md
index a58b07b..0b9c7d9 100644
--- a/docs/website/download/index.md
+++ b/docs/website/download/index.md
@@ -25,8 +25,8 @@ A pre-built package that contains Apache Brooklyn and all of its dependencies in
 **Choose your preferred file format to see the list of mirrors where you can download this file.**
 
 <div class="text-center">
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-bin.tar.gz" role="button">Tarball</a>
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-bin.zip" role="button">Zip</a>
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-bin.tar.gz" role="button">Tarball</a>
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-bin.zip" role="button">Zip</a>
   <br /><small>These are not direct download links, sorry</small>
 </div>
   </div>
@@ -49,8 +49,8 @@ contribute code changes to Apache Brooklyn, we recommend you get the source code
 **Choose your preferred file format to see the list of mirrors where you can download this file.**
 
 <div class="text-center">
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-src.tar.gz" role="button">Tarball</a>
-  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.cgi/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-src.zip" role="button">Zip</a>
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-src.tar.gz" role="button">Tarball</a>
+  <a class="btn btn-default" href="https://www.apache.org/dyn/closer.lua/incubator/brooklyn/apache-brooklyn-{{ site.brooklyn-stable-version }}/apache-brooklyn-{{ site.brooklyn-stable-version }}-src.zip" role="button">Zip</a>
   <br /><small>These are not direct download links, sorry</small>
 </div>
   </div>

[04/11] incubator-brooklyn git commit: README.MD quick start description update

Posted by he...@apache.org.
README.MD quick start description update

README.md previously directed users to run the app by using
“bin/brooklyn launch”, however this should be “./brooklyn/bin/brooklyn
launch”


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3bed218d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3bed218d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3bed218d

Branch: refs/heads/master
Commit: 3bed218db0b69a2d9e47963cf08b282272a3d05c
Parents: 23f7951
Author: Graeme-Miller <gr...@Graemes-MacBook-Pro.local>
Authored: Wed Sep 2 10:01:44 2015 +0100
Committer: Graeme-Miller <gr...@Graemes-MacBook-Pro.local>
Committed: Wed Sep 2 10:01:44 2015 +0100

----------------------------------------------------------------------
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3bed218d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index b40d28e..a05ee75 100644
--- a/README.md
+++ b/README.md
@@ -45,9 +45,8 @@ Alternatively, use Brooklyn as an integrated-stand-alone management node for you
 Three quick start options are available:
 
 * The [getting started guide](https://brooklyn.incubator.apache.org/v/latest/start/running.html) will step you through downloading and installing Brooklyn and running the examples.
-* Alternatively, [download the latest release](https://github.com/brooklyncentral/brooklyn/tarball/master) (tgz),
-* or, fork or clone the repo: `git clone git://github.com/apache/incubator-brooklyn.git` then `cd incubator-brooklyn; mvn clean install; cd usage/dist/target/brooklyn-dist; bin/brooklyn launch`
-`.
+* Alternatively, [download the latest release](https://github.com/brooklyncentral/brooklyn/tarball/master) (tgz).
+* Fork or clone the repo: `git clone git://github.com/apache/incubator-brooklyn.git` then `cd incubator-brooklyn; mvn clean install; cd usage/dist/target/brooklyn-dist; ./brooklyn/bin/brooklyn launch`.
 
 ## Community
 
@@ -86,4 +85,3 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-

[08/11] incubator-brooklyn git commit: This closes #874

Posted by he...@apache.org.
This closes #874


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/af9b60b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/af9b60b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/af9b60b0

Branch: refs/heads/master
Commit: af9b60b06c84766063a82ce579d0ff7861ea1709
Parents: 23f7951 f2ace50
Author: Alex Heneveld <al...@Alexs-MacBook-Pro.local>
Authored: Wed Sep 2 13:22:49 2015 +0100
Committer: Alex Heneveld <al...@Alexs-MacBook-Pro.local>
Committed: Wed Sep 2 13:22:49 2015 +0100

----------------------------------------------------------------------
 .../release-process/environment-variables.md    |  8 ++---
 .../release-process/make-release-artifacts.md   |  6 ++--
 .../committers/release-process/prerequisites.md | 31 +++++++++++++-------
 .../release-process/release-version.md          | 11 +++++++
 docs/website/download/index.md                  |  8 ++---
 usage/dist/licensing/overrides.yaml             | 10 +++++++
 .../src/main/license/source-inclusions.yaml     |  1 +
 7 files changed, 55 insertions(+), 20 deletions(-)
----------------------------------------------------------------------

[09/11] incubator-brooklyn git commit: This closes #875

Posted by he...@apache.org.
This closes #875


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e01412c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e01412c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e01412c1

Branch: refs/heads/master
Commit: e01412c19120c43b0946e9d0630c8b411d63b648
Parents: af9b60b 40fb684
Author: Alex Heneveld <al...@Alexs-MacBook-Pro.local>
Authored: Wed Sep 2 13:24:50 2015 +0100
Committer: Alex Heneveld <al...@Alexs-MacBook-Pro.local>
Committed: Wed Sep 2 13:24:50 2015 +0100

----------------------------------------------------------------------
 docs/guide/ops/install-on-server.md | 24 ++++++++++++------------
 docs/guide/start/policies.md        |  4 ++--
 docs/guide/start/running.md         | 20 ++++++++++----------
 3 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------

[05/11] incubator-brooklyn git commit: Updated AutoScalerPolicy Javadoc

Posted by he...@apache.org.
Updated AutoScalerPolicy Javadoc

Corrected a typo


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/53030bff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/53030bff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/53030bff

Branch: refs/heads/master
Commit: 53030bffe122256419f941312786d1d08279a24a
Parents: 3bed218
Author: Graeme-Miller <gr...@Graemes-MacBook-Pro.local>
Authored: Wed Sep 2 10:09:44 2015 +0100
Committer: Graeme-Miller <gr...@Graemes-MacBook-Pro.local>
Committed: Wed Sep 2 10:09:44 2015 +0100

----------------------------------------------------------------------
 .../org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/53030bff/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java
index ee2f5a9..d297828 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java
@@ -68,7 +68,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
  * emitted {@code POOL_COLD} and {@code POOL_HOT} events. Alternatively, the policy can be configured to
  * keep a given metric within a required range.
  * <p>
- * TThis policy does not itself determine whether the pool is hot or cold, but instead relies on these 
+ * This policy does not itself determine whether the pool is hot or cold, but instead relies on these
  * events being emitted by the monitored entity itself, or by another policy that is attached to it; see, 
  * for example, {@link LoadBalancingPolicy}.)
  */

[06/11] incubator-brooklyn git commit: Added link on DEVELOPER GUIDE page to Javadoc

Posted by he...@apache.org.
Added link on DEVELOPER GUIDE page to Javadoc


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/40789074
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/40789074
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/40789074

Branch: refs/heads/master
Commit: 40789074cb3fd64051ba39f4a207769f3a7ffdd1
Parents: 53030bf
Author: Graeme-Miller <gr...@Graemes-MacBook-Pro.local>
Authored: Wed Sep 2 10:10:56 2015 +0100
Committer: Graeme-Miller <gr...@Graemes-MacBook-Pro.local>
Committed: Wed Sep 2 10:10:56 2015 +0100

----------------------------------------------------------------------
 docs/guide/dev/index.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/40789074/docs/guide/dev/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/index.md b/docs/guide/dev/index.md
index 0a7acfd..450055a 100644
--- a/docs/guide/dev/index.md
+++ b/docs/guide/dev/index.md
@@ -15,6 +15,7 @@ children:
 - tips/logging.md
 - tips/debugging-remote-brooklyn.md
 - rest/rest-api-doc.md
+- { link: "http://brooklyn.incubator.apache.org/v/latest/misc/javadoc", title: "Javadoc" }
 ---
 
 {% comment %}

[03/11] incubator-brooklyn git commit: add r.js to list of dependencies

Posted by he...@apache.org.
add r.js to list of dependencies


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f2ace507
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f2ace507
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f2ace507

Branch: refs/heads/master
Commit: f2ace507a5404cac70d7c8c9fdb7b615b7c667be
Parents: bcb2d52
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 2 09:54:06 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 2 09:54:06 2015 +0100

----------------------------------------------------------------------
 usage/dist/licensing/overrides.yaml                 | 10 ++++++++++
 usage/jsgui/src/main/license/source-inclusions.yaml |  1 +
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f2ace507/usage/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/overrides.yaml b/usage/dist/licensing/overrides.yaml
index e1952ba..6d2cf14 100644
--- a/usage/dist/licensing/overrides.yaml
+++ b/usage/dist/licensing/overrides.yaml
@@ -114,6 +114,16 @@
   notice: Copyright (c) The Dojo Foundation (2010-2012)
   license: MIT
 
+- id: require.js/r.js
+  # new ID because this is a different version to the above
+  name: RequireJS (r.js maven plugin)
+  files: r.js
+  version: 2.1.6 
+  url: http://github.com/jrburke/requirejs for details
+  organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
+  notice: Copyright (c) The Dojo Foundation (2010-2012)
+  license: MIT
+
 - id: backbone.js
   version: 1.0.0
   url: http://backbonejs.org

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f2ace507/usage/jsgui/src/main/license/source-inclusions.yaml
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/license/source-inclusions.yaml b/usage/jsgui/src/main/license/source-inclusions.yaml
index a5bd59f..8592477 100644
--- a/usage/jsgui/src/main/license/source-inclusions.yaml
+++ b/usage/jsgui/src/main/license/source-inclusions.yaml
@@ -25,6 +25,7 @@
 - id: Swagger JS
 - id: Swagger UI
 - id: require.js
+- id: require.js/r.js
 - id: backbone.js
 - id: bootstrap.js
 - id: underscore.js

[02/11] incubator-brooklyn git commit: minor mods to the release instructions

Posted by he...@apache.org.
minor mods to the release instructions


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/48d06240
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/48d06240
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/48d06240

Branch: refs/heads/master
Commit: 48d06240189db8ff13107c57e4a37ec935703b65
Parents: 23f7951
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Sep 1 20:24:25 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 2 09:22:44 2015 +0100

----------------------------------------------------------------------
 .../release-process/environment-variables.md    |  8 ++---
 .../release-process/make-release-artifacts.md   |  6 ++--
 .../committers/release-process/prerequisites.md | 31 +++++++++++++-------
 .../release-process/release-version.md          | 11 +++++++
 4 files changed, 40 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48d06240/docs/website/developers/committers/release-process/environment-variables.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/committers/release-process/environment-variables.md b/docs/website/developers/committers/release-process/environment-variables.md
index a82f631..886d3c7 100644
--- a/docs/website/developers/committers/release-process/environment-variables.md
+++ b/docs/website/developers/committers/release-process/environment-variables.md
@@ -8,13 +8,13 @@ Many example commands in this section using variable names as placeholders for i
 releases. To allow these example commands to run unmodified, set these environment variables appropriately.
 
 {% highlight bash %}
-# The version currently set on the master branch
-OLD_MASTER_VERSION=0.7.0-SNAPSHOT
+# The version currently set on the master branch (BROOKLYN_VERSION_BELOW)
+OLD_MASTER_VERSION=0.9.0-SNAPSHOT
 # The next version to be set on the master branch
-NEW_MASTER_VERSION=0.8.0-SNAPSHOT
+NEW_MASTER_VERSION=0.NNN+1.0-SNAPSHOT
 
 # The version we are releasing now. While Brooklyn is in the Apache Incubator, this must be suffixed `-incubating`.
-VERSION_NAME=0.7.0-incubating
+VERSION_NAME=0.NNN.0-incubating
 
 # The release candidate number we are making now.
 RC_NUMBER=1

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48d06240/docs/website/developers/committers/release-process/make-release-artifacts.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/committers/release-process/make-release-artifacts.md b/docs/website/developers/committers/release-process/make-release-artifacts.md
index 135610aea..886f688 100644
--- a/docs/website/developers/committers/release-process/make-release-artifacts.md
+++ b/docs/website/developers/committers/release-process/make-release-artifacts.md
@@ -5,11 +5,11 @@ navgroup: developers
 ---
 
 A release script is provided in `release/make-release-artifacts.sh`. This script will prepare all the release artifacts.
-It is written to account for several Apache requirements, so you are advised to use it rather than "rolling your own".
+It is written to account for several Apache requirements, so you are strongly advised to use it rather than "rolling your own".
 
 The release script will:
 
-- **Create source code and binary distribution artifacts** and place them in a directory on your workstation.
+- **Create source code and binary distribution artifacts** and place them in a temporary staging directory on your workstation, usually `releases/`.
 - **Create Maven artifacts and upload them to a staging repository** located on the Apache Nexus server.
 
 The script has a single required parameter `-r` which is given the release candidate number - so `-r1` will create
@@ -24,6 +24,8 @@ To run the script:
 It will show you the release information it has deduced, and ask yes-or-no if it can proceed. Please note that the
 script will thoroughly clean the Git workspace of all uncommited and unadded files.
 
+**You really probably want to run this against a secondary checkout.** It will wipe `.project` files and other IDE metadata, and bad things can happen if an IDE tries to write while the script is running. Also as it takes a long time, this means your workspace is not tied up. One quick and easy way to do this is to `git clone` the local directory of your primary checkout to a secondary location.
+
 A few minutes into the script you will be prompted for the passphrase to your GnuPG private key. You should only be
 asked this question once; the GnuPG agent will cache the password for the remainder of the build.
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48d06240/docs/website/developers/committers/release-process/prerequisites.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/committers/release-process/prerequisites.md b/docs/website/developers/committers/release-process/prerequisites.md
index 086df5a..7c6708a 100644
--- a/docs/website/developers/committers/release-process/prerequisites.md
+++ b/docs/website/developers/committers/release-process/prerequisites.md
@@ -32,16 +32,24 @@ pre-release software to the global release mirror network!
 GPG keys
 --------
 
-The release manager must have a GPG key to be used to sign the release.
+The release manager must have a GPG key to be used to sign the release. See below to install `gpg2`
+(with a `gpg` alias).  The steps here also assume you have the following set
+(not using `whoami` if that's not appropriate):
+
+{% highlight bash %}
+GPG_KEY=`whoami`@apache.org
+SVN_USERNAME=`whoami`
+{% endhighlight %}
 
 If you have an existing GPG key, but it does not include your Apache email address, you can add your email address as
 described [in this Superuser.com posting](https://superuser.com/a/293283). Otherwise, create a new GPG key giving your
-Apache email address.
+Apache email address, using `gpg2 --gen-key` then `gpg2 --export-key $GPG_KEY > my-apache.key` and 
+`gpg2 --export-secret-key -a $GPG_KEY > my-apache.private.key` in the right directory (`~/.ssh` is a good one).
 
 Upload your GPG public key (complete with your Apache email address on it) to a public keyserver - e.g. run
-`gpg2 --export --armor richard@apache.org` and paste it into the “submit” box on http://pgp.mit.edu/
+`gpg2 --export --armor $GPG_KEY` and paste it into the “submit” box on http://pgp.mit.edu/
 
-Look up your key fingerprint with `gpg2 --fingerprint richard@apache.org` - it’s the long sequence of hex numbers
+Look up your key fingerprint with `gpg2 --fingerprint $GPG_KEY` - it’s the long sequence of hex numbers
 separated by spaces. Log in to [https://id.apache.org/](https://id.apache.org/) then copy-and-paste the fingerprint into
 “OpenPGP Public Key Primary Fingerprint”. Submit.
 
@@ -50,10 +58,12 @@ Now add your key to the `apache-dist-release-brooklyn/KEYS` file:
 {% highlight bash %}
 cd apache-dist-release-brooklyn
 (gpg2 --list-sigs richard@apache.org && gpg2 --armor --export richard@apache.org) >> KEYS
-svn commit -m 'Update incubator/brooklyn/KEYS'
+svn --username $SVN_USERNAME commit -m 'Update incubator/brooklyn/KEYS for $GPG_KEY'
 {% endhighlight %}
 
-References: [Post on the general@incubator list](https://mail-archives.apache.org/mod_mbox/incubator-general/201410.mbox/%3CCAOGo0VawupMYRWJKm%2Bi%2ByMBqDQQtbv-nQkfRud5%2BV9PusZ2wnQ%40mail.gmail.com%3E)
+References: 
+* [Post on the general@incubator list](https://mail-archives.apache.org/mod_mbox/incubator-general/201410.mbox/%3CCAOGo0VawupMYRWJKm%2Bi%2ByMBqDQQtbv-nQkfRud5%2BV9PusZ2wnQ%40mail.gmail.com%3E)
+* [GPG cheatsheet](http://irtfweb.ifa.hawaii.edu/~lockhart/gpg/gpg-cs.html)
 
 
 Software packages
@@ -63,14 +73,15 @@ The following software packages are required during the build. Make sure you hav
 
 - A Java Development Kit, version 1.7
 - `maven` and `git`
-- `xmlstarlet` is required by the release script to process version numbers in `pom.xml` files
+- `xmlstarlet` is required by the release script to process version numbers in `pom.xml` files;
+  on mac, `port install xmlstarlet` should do the trick.
 - `zip` and `unzip`
 - `pinentry` for secure entry of GPG passphrases. If you are building remotely on a Linux machine, `pinentry-curses` is
   recommended; building on a mac, `port install pinentry-mac` is recommended.
 - `gnupg2`, and `gnupg-agent` if it is packaged separately (it is on Ubuntu Linux)
-- `md5sum` and `sha1sum` - these are often present by default on Linux, but not on Mac. MacPorts provides these in the
-  package `md5sha1sum`.
-
+- `md5sum` and `sha1sum` - these are often present by default on Linux, but not on Mac;
+  `port install md5sha1sum` should remedy that.
+- if `gpg` does not resolve (it is needed for maven), create an alias or script pointing at `gpg2 "$@"`
 
 Maven configuration
 -------------------

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/48d06240/docs/website/developers/committers/release-process/release-version.md
----------------------------------------------------------------------
diff --git a/docs/website/developers/committers/release-process/release-version.md b/docs/website/developers/committers/release-process/release-version.md
index 4f36d49..e43868b 100644
--- a/docs/website/developers/committers/release-process/release-version.md
+++ b/docs/website/developers/committers/release-process/release-version.md
@@ -51,6 +51,8 @@ Update the version on master
 The `master` branch will now need updating to refer to the next planned version. (This step is not required if making
 a "milestone" release or similar.)
 
+The release notes should be cleared out and the version history augmented with the new version.
+
 Example:
 
 {% highlight bash %}
@@ -58,6 +60,15 @@ git checkout master
 ./release/change-version.sh BROOKLYN $OLD_MASTER_VERSION $NEW_MASTER_VERSION
 git add .
 # Now inspect the staged changes and ensure there are no surprises
+{% endhighlight %}
+
+Open `docs/guide/misc/release-notes.md` and `docs/website/meta/versions.md` in your favourite editor and amend.
+For release notes this means bumping the reference to the previous version in the "Backwards Compatibility" section
+and putting some placeholder text elsewhere.
+
+Then:
+
+{% highlight bash %}
 git commit -m "Change version to $NEW_MASTER_VERSION"
 git push
 {% endhighlight %}

[11/11] incubator-brooklyn git commit: remove old brooklyncentral github project references in root README

Posted by he...@apache.org.
remove old brooklyncentral github project references in root README


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/81f2e376
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/81f2e376
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/81f2e376

Branch: refs/heads/master
Commit: 81f2e376c0df7111a2f94d482880a5b66a27ab7a
Parents: 95728b8
Author: Alex Heneveld <al...@Alexs-MacBook-Pro.local>
Authored: Wed Sep 2 13:29:12 2015 +0100
Committer: Alex Heneveld <al...@Alexs-MacBook-Pro.local>
Committed: Wed Sep 2 13:29:12 2015 +0100

----------------------------------------------------------------------
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/81f2e376/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a05ee75..cfd1393 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-# [![**Brooklyn**](https://brooklyn.incubator.apache.org/style/img/brooklyn.gif)](http://brooklyncentral.github.com)
+# [![**Brooklyn**](https://brooklyn.incubator.apache.org/style/img/brooklyn.gif)](http://brooklyn.incubator.apache.org/)
 
 Apache Brooklyn is a library and control plane for deploying and managing distributed applications.
 
@@ -45,7 +45,7 @@ Alternatively, use Brooklyn as an integrated-stand-alone management node for you
 Three quick start options are available:
 
 * The [getting started guide](https://brooklyn.incubator.apache.org/v/latest/start/running.html) will step you through downloading and installing Brooklyn and running the examples.
-* Alternatively, [download the latest release](https://github.com/brooklyncentral/brooklyn/tarball/master) (tgz).
+* Alternatively, [download the latest release](https://github.com/apache/incubator-brooklyn/tarball/master) (tgz).
 * Fork or clone the repo: `git clone git://github.com/apache/incubator-brooklyn.git` then `cd incubator-brooklyn; mvn clean install; cd usage/dist/target/brooklyn-dist; ./brooklyn/bin/brooklyn launch`.
 
 ## Community
@@ -53,7 +53,7 @@ Three quick start options are available:
 
 * Have a question that's not a feature request or bug report? Ask on the mailing lists: [brooklyn-users](http://groups.google.com/group/brooklyn-users) or [brooklyn-dev](http://groups.google.com/group/brooklyn-dev)
 * Chat with us over IRC. On the `irc.freenode.net` server, in the `#brooklyncentral` channel.
-* Follow [@brooklyncentral on Twitter](http://twitter.com/brooklyncentral).
+* Follow [@ApacheBrooklyn](http://twitter.com/ApacheBrooklyn) and [@BrooklynCentral](http://twitter.com/brooklyncentral) on Twitter.
 
 
 ## Bug Tracker

[10/11] incubator-brooklyn git commit: This closes #876

Posted by he...@apache.org.
This closes #876


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/95728b8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/95728b8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/95728b8d

Branch: refs/heads/master
Commit: 95728b8d74f3c2d31979adeaa1cf8471a71de9c7
Parents: e01412c 4078907
Author: Alex Heneveld <al...@Alexs-MacBook-Pro.local>
Authored: Wed Sep 2 13:26:47 2015 +0100
Committer: Alex Heneveld <al...@Alexs-MacBook-Pro.local>
Committed: Wed Sep 2 13:26:47 2015 +0100

----------------------------------------------------------------------
 README.md                                                      | 6 ++----
 docs/guide/dev/index.md                                        | 1 +
 .../apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------

[07/11] incubator-brooklyn git commit: Small edits to documentation.

Posted by he...@apache.org.
Small edits to documentation.

Correct archive name and path for installation. Fix typos.
Bump Java version to 1.7 in install-on-server.md.
Change Brooklyn to Apache Brooklyn in headings and first occurence in the body text.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/40fb6841
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/40fb6841
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/40fb6841

Branch: refs/heads/master
Commit: 40fb684162a59e40032f042d5d49b9a96feb5fd5
Parents: 5d8ae8f
Author: googlielmo <gu...@cloudsoftcorp.com>
Authored: Wed Sep 2 11:47:05 2015 +0200
Committer: googlielmo <gu...@cloudsoftcorp.com>
Committed: Wed Sep 2 11:52:05 2015 +0200

----------------------------------------------------------------------
 docs/guide/ops/install-on-server.md | 24 ++++++++++++------------
 docs/guide/start/policies.md        |  4 ++--
 docs/guide/start/running.md         | 20 ++++++++++----------
 3 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/40fb6841/docs/guide/ops/install-on-server.md
----------------------------------------------------------------------
diff --git a/docs/guide/ops/install-on-server.md b/docs/guide/ops/install-on-server.md
index 96c70a5..48a527e 100644
--- a/docs/guide/ops/install-on-server.md
+++ b/docs/guide/ops/install-on-server.md
@@ -1,11 +1,11 @@
 ---
 layout: website-normal
-title: Installing Brooklyn
+title: Installing Apache Brooklyn
 ---
 
 {% include fields.md %}
 
-Here we present two *alternatives* to install Brooklyn:
+Here we present two *alternatives* to install Apache Brooklyn:
 
 - [Running the *installation script*](#script)
 - [Manual installation](#manual)
@@ -20,9 +20,9 @@ The script assumes that the server is a recent *RHEL/CentOS 6.x Linux* or *Ubunt
 
 The script will install Java 7 and other required packages if they are not present. 
 You must have root access over [passwordless SSH]({{ site.path.guide }}/ops/locations/ssh-keys.html) 
-to install brooklyn, but the service runs as an ordinary user once installed. 
+to install Brooklyn, but the service runs as an ordinary user once installed. 
 
-To manage the brooklyn service you must also be able to connect to port 8081 remotely.
+To manage the Brooklyn service you must also be able to connect to port 8081 remotely.
 
 Once the above prerequisites are satisfied, you should be able to run successfully:
 {% highlight bash %}
@@ -35,7 +35,7 @@ $ ./brooklyn-install.sh -s -r <your-server-ip>
 ## <a id="manual"></a> Manual Installation
 
 1. [Set up the prerequisites](#prerequisites)
-1. [Download Brooklyn](#download)
+1. [Download Apache Brooklyn](#download)
 1. [Configuring brooklyn.properties](#configuring-properties)
 1. [Configuring default.catalog.bom](#configuring-catalog)
 1. [Test the installation](#confirm)
@@ -43,9 +43,9 @@ $ ./brooklyn-install.sh -s -r <your-server-ip>
 
 ### <a id="prerequisites"></a>Set up the Prerequisites
 
-Before installing Apache Brooklyn, it is recommented to configure the host as follows. 
+Before installing Brooklyn, it is recommended to configure the host as follows. 
 
-* install Java JRE or SDK (version 6 or later)
+* install Java JRE or JDK (version 7 or later)
 * install an [SSH key]({{ site.path.guide }}/ops/locations/ssh-keys.html), if not available
 * enable [passwordless ssh login]({{ site.path.guide }}/ops/locations/ssh-keys.html)
 * create a `~/.brooklyn` directory on the host with `$ mkdir ~/.brooklyn`
@@ -53,7 +53,7 @@ Before installing Apache Brooklyn, it is recommented to configure the host as fo
 * check that the [linux kernel entropy]({{ site.path.website }}/documentation/increase-entropy.html) is sufficient
 
 
-### <a id="download"></a>Download Brooklyn
+### <a id="download"></a>Download Apache Brooklyn
 
 Download Brooklyn and obtain a binary build as described on [the download page]({{site.path.website}}/download/).
 
@@ -65,20 +65,20 @@ Expand the `tar.gz` archive:
 
 {% if brooklyn_version contains 'SNAPSHOT' %}
 {% highlight bash %}
-$ tar -zxf brooklyn-dist-{{ site.brooklyn-stable-version }}-timestamp-dist.tar.gz
+$ tar -zxf apache-brooklyn-dist-{{ site.brooklyn-stable-version }}-timestamp-dist.tar.gz
 {% endhighlight %}
 {% else %}
 {% highlight bash %}
-$ tar -zxf brooklyn-{{ site.brooklyn-stable-version }}-dist.tar.gz
+$ tar -zxf apache-brooklyn-{{ site.brooklyn-stable-version }}-dist.tar.gz
 {% endhighlight %}
 {% endif %}
 
-This will create a `brooklyn-{{ site.brooklyn-stable-version }}` folder.
+This will create a `apache-brooklyn-{{ site.brooklyn-stable-version }}` folder.
 
 Let's setup some paths for easy commands.
 
 {% highlight bash %}
-$ cd brooklyn-{{ site.brooklyn-stable-version }}
+$ cd apache-brooklyn-{{ site.brooklyn-stable-version }}
 $ BROOKLYN_DIR="$(pwd)"
 $ export PATH=$PATH:$BROOKLYN_DIR/bin/
 {% endhighlight %}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/40fb6841/docs/guide/start/policies.md
----------------------------------------------------------------------
diff --git a/docs/guide/start/policies.md b/docs/guide/start/policies.md
index 31b6e27..612aa83 100644
--- a/docs/guide/start/policies.md
+++ b/docs/guide/start/policies.md
@@ -6,7 +6,7 @@ layout: website-normal
 
 ### Exploring and Testing Policies
 
-The Demo Web Cluster with DB application is pre-configured with two polices.
+The Demo Web Cluster with DB application is pre-configured with two policies.
 
 The app server cluster has an `AutoScalerPolicy`, and the loadbalancer has a `targets` policy.
 
@@ -23,7 +23,7 @@ The loadbalancer's `targets` policy ensures that the loadbalancer is updated as
 
 Sitting idle, this cluster will only contain one server, but you can use a tool like [jmeter](http://jmeter.apache.org/) pointed at the nginx endpoint to create load on the cluster. (Download a [jmeter test plan](https://github.com/apache/incubator-brooklyn/blob/master/examples/simple-web-cluster/resources/jmeter-test-plan.jmx).)
 
-As load is added, Brooklyn requests a new cloud machine, creates a new app server, and adds it to the cluster. As load is removed, servers are removed from the cluster, and the infrastructure is handed back to the cloud.
+As load is added, Apache Brooklyn requests a new cloud machine, creates a new app server, and adds it to the cluster. As load is removed, servers are removed from the cluster, and the infrastructure is handed back to the cloud.
 
 
 ### Under the Covers

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/40fb6841/docs/guide/start/running.md
----------------------------------------------------------------------
diff --git a/docs/guide/start/running.md b/docs/guide/start/running.md
index 0a31c6d..2f97bab 100644
--- a/docs/guide/start/running.md
+++ b/docs/guide/start/running.md
@@ -1,17 +1,17 @@
 ---
-title: Running Brooklyn
-title_in_menu: Running Brooklyn
+title: Running Apache Brooklyn
+title_in_menu: Running Apache Brooklyn
 layout: website-normal
 menu_parent: index.md
 ---
 
 This guide will walk you through deploying an example 3-tier web application to a public cloud. 
 
-This tutorial assumes that you are using Linux or Mac OSX.
+This tutorial assumes that you are using Linux or Mac OS X.
 
-## Install Brooklyn
+## Install Apache Brooklyn
 
-Download Brooklyn and obtain a binary build as described on [the download page]({{site.path.website}}/download/).
+Download Apache Brooklyn and obtain a binary build as described on [the download page]({{site.path.website}}/download/).
 
 {% if brooklyn_version contains 'SNAPSHOT' %}
 Expand the `tar.gz` archive (note: as this is a -SNAPSHOT version, your filename will be slightly different):
@@ -21,15 +21,15 @@ Expand the `tar.gz` archive:
 
 {% if brooklyn_version contains 'SNAPSHOT' %}
 {% highlight bash %}
-$ tar -zxf brooklyn-dist-{{ site.brooklyn-version }}-timestamp-dist.tar.gz
+$ tar -zxf apache-brooklyn-dist-{{ site.brooklyn-version }}-timestamp-dist.tar.gz
 {% endhighlight %}
 {% else %}
 {% highlight bash %}
-$ tar -zxf brooklyn-{{ site.brooklyn-version }}-dist.tar.gz
+$ tar -zxf apache-brooklyn-{{ site.brooklyn-version }}-dist.tar.gz
 {% endhighlight %}
 {% endif %}
 
-This will create a `brooklyn-{{ site.brooklyn-version }}` folder.
+This will create a `apache-brooklyn-{{ site.brooklyn-version }}` folder.
 
 **Note**: You'll need a Java JRE or SDK installed (version 1.7 or later), as Brooklyn is Java under the covers.
 
@@ -37,12 +37,12 @@ This will create a `brooklyn-{{ site.brooklyn-version }}` folder.
 to ensure that your Brooklyn can access your machine.
 
 
-## Launch Brooklyn
+## Launch Apache Brooklyn
 
 Now start Brooklyn with the following command:
 
 {% highlight bash %}
-$ cd brooklyn-{{ site.brooklyn.version }}
+$ cd apache-brooklyn-{{ site.brooklyn.version }}
 $ bin/brooklyn launch
 {% endhighlight %}