Skip to content
Permalink
Browse files
Bump version to 0.12.0-SNAPSHOT
  • Loading branch information
rdowner committed Apr 11, 2017
1 parent f88c8dd commit 05ba6cf24cd155f340462c3640503f1a10842e0c
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 20 deletions.
@@ -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.11.0-SNAPSHOT/"
echo "* guide-version : to build the guide only, in the versioned namespace /v/0.12.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.11.0-SNAPSHOT
DIRS_TO_MOVE_TARGET[0]=v/0.12.0-SNAPSHOT
DIRS_TO_MOVE[1]=style
STYLE_SUBDIR=${DIRS_TO_MOVE_TARGET[0]}/style
DIRS_TO_MOVE_TARGET[1]=$STYLE_SUBDIR
@@ -1,6 +1,6 @@
path:
# BROOKLYN_VERSION_BELOW
guide: /v/0.11.0-SNAPSHOT
guide: /v/0.12.0-SNAPSHOT
# BROOKLYN_VERSION_BELOW
style: /v/0.11.0-SNAPSHOT/style
style: /v/0.12.0-SNAPSHOT/style
website: ""
@@ -1,15 +1,15 @@
<html><body>

<!-- BROOKLYN_VERSION_BELOW -->
Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 0.11.0-SNAPSHOT
Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 0.12.0-SNAPSHOT

<p>
Apache Brooklyn is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v2.0</a>.
</p>

<p>
<!-- BROOKLYN_VERSION_BELOW -->
This is the Javadoc for v 0.11.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}.
This is the Javadoc for v 0.12.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}.
</p>

</body><html>
@@ -54,7 +54,7 @@ pdf-rewrite-prefixes:
'/guide' : '/v/0.10.0'
'/website' : ''

brooklyn-version: 0.11.0-SNAPSHOT # BROOKLYN_VERSION
brooklyn-version: 0.12.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.
@@ -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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
</dependency>
</dependencies>

@@ -7,7 +7,7 @@
#
module BrooklynMetadata

BROOKLYN_VERSION = "0.11.0-SNAPSHOT" unless defined? BROOKLYN_VERSION
BROOKLYN_VERSION = "0.12.0-SNAPSHOT" unless defined? BROOKLYN_VERSION

class Generator < Jekyll::Generator
def generate(site)
@@ -115,17 +115,17 @@ 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.11.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.12.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.

...

[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.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.
{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.12.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.12.0-SNAPSHOT-dist.tar.gz
{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.12.0-SNAPSHOT; it doesn't have an associated file or directory.

...

@@ -25,7 +25,7 @@ This should return details of the build as a JSON string similar to the followin

{% highlight json %}
{
"version": "0.11.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %}
"version": "0.12.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %}
"buildSha1": "c0fdc15291702281acdebf1b11d431a6385f5224",
"buildBranch": "UNKNOWN"
}
@@ -1,6 +1,6 @@
---
# BROOKLYN_VERSION_BELOW
title: Other 0.11.0-SNAPSHOT Resources
title: Other 0.12.0-SNAPSHOT Resources
layout: website-normal
started-pdf-exclude: true
children:
@@ -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.11.0-SNAPSHOT
http://localhost:8081/#v1/catalog/entities/cluster:0.12.0-SNAPSHOT

And in the REST API it is accessed at:

<!-- BROOKLYN_VERSION_BELOW -->
http://localhost:8081/v1/catalog/entities/cluster:0.11.0-SNAPSHOT
http://localhost:8081/v1/catalog/entities/cluster:0.12.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.
@@ -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.11.0-SNAPSHOT) <!-- BROOKLYN_VERSION --></a>
* <a href="{{ site.path.guide }}/">the brooklyn user guide (version 0.12.0-SNAPSHOT) <!-- BROOKLYN_VERSION --></a>

Also see the file <code>README.md</code> in this directory.

@@ -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.11.0-SNAPSHOT-dist.tar.gz` <!-- BROOKLYN_VERSION -->
This will produce an artifact in `brooklyn-dist/dist/brooklyn-dist-0.12.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:

@@ -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.11.0-SNAPSHOT
OLD_MASTER_VERSION=0.12.0-SNAPSHOT
# The next version to be set on the master branch
NEW_MASTER_VERSION=0.10.0-SNAPSHOT

0 comments on commit 05ba6cf

Please sign in to comment.