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 2016/02/01 18:45:01 UTC
[46/50] brooklyn-docs git commit: Change version to 0.7.0-incubating
Change version to 0.7.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/31f0c218
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/31f0c218
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/31f0c218
Branch: refs/heads/0.7.0-incubating
Commit: 31f0c21858b272c13e819369654647b9afbdf1b2
Parents: 756aaf4
Author: Richard Downer <ri...@apache.org>
Authored: Fri Jun 26 14:10:44 2015 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Jun 26 14:10:44 2015 +0000
----------------------------------------------------------------------
docs/_build/build.sh | 4 ++--
docs/_build/config-guide-version.yml | 4 ++--
docs/_build/javadoc-overview.html | 4 ++--
docs/_build/make-javadoc.sh | 2 +-
docs/_config.yml | 2 +-
docs/_extra/simple_java_examples/examples.md | 2 +-
docs/_plugins/brooklyn_metadata.rb | 2 +-
docs/guide/dev/env/maven-build.md | 8 ++++----
docs/guide/dev/tips/debugging-remote-brooklyn.md | 2 +-
docs/guide/misc/index.md | 2 +-
docs/index.md | 2 +-
docs/website/community/how-to-contribute-docs.md | 2 +-
12 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/31f0c218/docs/_build/build.sh
----------------------------------------------------------------------
diff --git a/docs/_build/build.sh b/docs/_build/build.sh
index 40f826c..6044dc8 100755
--- a/docs/_build/build.sh
+++ b/docs/_build/build.sh
@@ -21,7 +21,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.7.0-SNAPSHOT/"
+ echo "* guide-version : to build the guide only, in the versioned namespace /v/0.7.0-incubating/"
echo "* test-guide-root : to build the guide only, in the root (for testing)"
echo "* test-both : to build the website to root and guide to /v/latest/ (for testing)"
echo "* test-both-sub : to build the website to /sub/ and guide to /sub/v/latest/ (for testing)"
@@ -71,7 +71,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.7.0-SNAPSHOT
+ DIRS_TO_MOVE_TARGET[0]=v/0.7.0-incubating
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/31f0c218/docs/_build/config-guide-version.yml
----------------------------------------------------------------------
diff --git a/docs/_build/config-guide-version.yml b/docs/_build/config-guide-version.yml
index 640f22f..d25df6b 100644
--- a/docs/_build/config-guide-version.yml
+++ b/docs/_build/config-guide-version.yml
@@ -1,6 +1,6 @@
path:
# BROOKLYN_VERSION_BELOW
- guide: /v/0.7.0-SNAPSHOT
+ guide: /v/0.7.0-incubating
# BROOKLYN_VERSION_BELOW
- style: /v/0.7.0-SNAPSHOT/style
+ style: /v/0.7.0-incubating/style
website: ""
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/31f0c218/docs/_build/javadoc-overview.html
----------------------------------------------------------------------
diff --git a/docs/_build/javadoc-overview.html b/docs/_build/javadoc-overview.html
index 1213e18..871e00b 100644
--- a/docs/_build/javadoc-overview.html
+++ b/docs/_build/javadoc-overview.html
@@ -1,7 +1,7 @@
<html><body>
<!-- BROOKLYN_VERSION_BELOW -->
-Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 0.7.0-SNAPSHOT
+Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 0.7.0-incubating
<p>
Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the
@@ -16,7 +16,7 @@ Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 0.7.0-SNAPSHOT
<p>
<!-- BROOKLYN_VERSION_BELOW -->
-This is the Javadoc for v 0.7.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}.
+This is the Javadoc for v 0.7.0-incubating (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}.
</p>
</body><html>
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/31f0c218/docs/_build/make-javadoc.sh
----------------------------------------------------------------------
diff --git a/docs/_build/make-javadoc.sh b/docs/_build/make-javadoc.sh
index 9dd9f82..80a6c24 100755
--- a/docs/_build/make-javadoc.sh
+++ b/docs/_build/make-javadoc.sh
@@ -24,7 +24,7 @@ export DATESTAMP=`date "+%Y-%m-%d"`
export SHA1STAMP=`git rev-parse HEAD`
# BROOKLYN_VERSION_BELOW
-export BROOKLYN_JAVADOC_CLASSPATH=../../usage/all/target/brooklyn-all-0.7.0-SNAPSHOT-with-dependencies.jar
+export BROOKLYN_JAVADOC_CLASSPATH=../../usage/all/target/brooklyn-all-0.7.0-incubating-with-dependencies.jar
if [ \! -f ${BROOKLYN_JAVADOC_CLASSPATH} ]; then
echo "Expected to find ${BROOKLYN_JAVADOC_CLASSPATH}"
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/31f0c218/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index e25b279..990df07 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -50,7 +50,7 @@ brooklyn-stable-versions: [ 0.7.0-M2-incubating ]
brooklyn-stable-version: 0.7.0-M2-incubating
-brooklyn-version: 0.7.0-SNAPSHOT # BROOKLYN_VERSION
+brooklyn-version: 0.7.0-incubating # 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/31f0c218/docs/_extra/simple_java_examples/examples.md
----------------------------------------------------------------------
diff --git a/docs/_extra/simple_java_examples/examples.md b/docs/_extra/simple_java_examples/examples.md
index 2063a3f..e0d9452 100644
--- a/docs/_extra/simple_java_examples/examples.md
+++ b/docs/_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.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION -->
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/31f0c218/docs/_plugins/brooklyn_metadata.rb
----------------------------------------------------------------------
diff --git a/docs/_plugins/brooklyn_metadata.rb b/docs/_plugins/brooklyn_metadata.rb
index cb2ba2e..5a4b7d4 100644
--- a/docs/_plugins/brooklyn_metadata.rb
+++ b/docs/_plugins/brooklyn_metadata.rb
@@ -7,7 +7,7 @@
#
module BrooklynMetadata
- BROOKLYN_VERSION = "0.7.0-SNAPSHOT" unless defined? BROOKLYN_VERSION
+ BROOKLYN_VERSION = "0.7.0-incubating" unless defined? BROOKLYN_VERSION
class Generator < Jekyll::Generator
def generate(site)
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/31f0c218/docs/guide/dev/env/maven-build.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/env/maven-build.md b/docs/guide/dev/env/maven-build.md
index fa0895b..5255546 100644
--- a/docs/guide/dev/env/maven-build.md
+++ b/docs/guide/dev/env/maven-build.md
@@ -104,7 +104,7 @@ 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.7.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.7.0-incubating; it doesn't have an associated file or directory.
[INFO] Copying files to ~/repos/apache/incubator-brooklyn/usage/dist/target/brooklyn-dist
[WARNING] Assembly file: ~/repos/apache/incubator-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.
@@ -112,9 +112,9 @@ although we'd love to if anyone can help!):
[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.7.0-SNAPSHOT; it doesn't have an associated file or directory.
-{% comment %}BROOKLYN_VERSION{% endcomment %}[INFO] Building tar: /Users/aled/repos/apache/incubator-brooklyn/usage/dist/target/brooklyn-0.7.0-SNAPSHOT-dist.tar.gz
-{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.7.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.7.0-incubating; it doesn't have an associated file or directory.
+{% comment %}BROOKLYN_VERSION{% endcomment %}[INFO] Building tar: /Users/aled/repos/apache/incubator-brooklyn/usage/dist/target/brooklyn-0.7.0-incubating-dist.tar.gz
+{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.7.0-incubating; it doesn't have an associated file or directory.
...
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/31f0c218/docs/guide/dev/tips/debugging-remote-brooklyn.md
----------------------------------------------------------------------
diff --git a/docs/guide/dev/tips/debugging-remote-brooklyn.md b/docs/guide/dev/tips/debugging-remote-brooklyn.md
index dc087af..a2e1bc5 100644
--- a/docs/guide/dev/tips/debugging-remote-brooklyn.md
+++ b/docs/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.7.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %}
+ "version": "0.7.0-incubating", {% comment %}BROOKLYN_VERSION{% endcomment %}
"buildSha1": "c0fdc15291702281acdebf1b11d431a6385f5224",
"buildBranch": "UNKNOWN"
}
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/31f0c218/docs/guide/misc/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/misc/index.md b/docs/guide/misc/index.md
index 9639cbf..4bafea5 100644
--- a/docs/guide/misc/index.md
+++ b/docs/guide/misc/index.md
@@ -1,6 +1,6 @@
---
# BROOKLYN_VERSION_BELOW
-title: Other 0.7.0-SNAPSHOT Resources
+title: Other 0.7.0-incubating Resources
layout: website-normal
children:
- { title: Javadoc, path: javadoc/ }
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/31f0c218/docs/index.md
----------------------------------------------------------------------
diff --git a/docs/index.md b/docs/index.md
index 5d2c44b..ede7315 100644
--- a/docs/index.md
+++ b/docs/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.7.0-SNAPSHOT) <!-- BROOKLYN_VERSION --></a>
+* <a href="{{ site.path.guide }}/">the brooklyn user guide (version 0.7.0-incubating) <!-- 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/31f0c218/docs/website/community/how-to-contribute-docs.md
----------------------------------------------------------------------
diff --git a/docs/website/community/how-to-contribute-docs.md b/docs/website/community/how-to-contribute-docs.md
index 7d6a8bf..af3ac9a 100644
--- a/docs/website/community/how-to-contribute-docs.md
+++ b/docs/website/community/how-to-contribute-docs.md
@@ -27,7 +27,7 @@ The Brooklyn documentation is split into two parts:
- **Version-specific user guide**. These pages have a URL with a path that
begins /v/*version-number*: for example,
- https://brooklyn.incubator.apache.org/v/0.7.0-SNAPSHOT and {% comment %}BROOKLYN_VERSION{% endcomment %}
+ https://brooklyn.incubator.apache.org/v/0.7.0-incubating and {% comment %}BROOKLYN_VERSION{% endcomment %}
the special *latest* set at https://brooklyn.incubator.apache.org/v/latest .
Content for this is in the `guide` directory.