brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [12/13] incubator-brooklyn git commit: change version in imported docs to M2
Date Fri, 09 Jan 2015 16:09:40 GMT
change version in imported docs to M2


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

Branch: refs/heads/0.7.0-M2-incubating-docs
Commit: 5382bc9dc183277dcf1aaf0d0f8b372e83a36d10
Parents: a7a317b
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Fri Jan 9 16:05:10 2015 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Fri Jan 9 16:05:10 2015 +0000

----------------------------------------------------------------------
 docs/_build/build.sh                         | 4 ++--
 docs/_build/config-guide-version.yml         | 4 ++--
 docs/_build/make-javadoc.sh                  | 2 +-
 docs/_config.yml                             | 2 +-
 docs/_extra/simple_java_examples/examples.md | 2 +-
 docs/guide/misc/index.md                     | 2 +-
 docs/guide/start/catalog.xml                 | 4 ++--
 docs/index.md                                | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5382bc9d/docs/_build/build.sh
----------------------------------------------------------------------
diff --git a/docs/_build/build.sh b/docs/_build/build.sh
index 69b2bfa..743d02e 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-M2-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)"
@@ -65,7 +65,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-M2-incubating
     DIRS_TO_MOVE[1]=style
     DIRS_TO_MOVE_TARGET[1]=${DIRS_TO_MOVE_TARGET[0]}/style
     INSTALL_RSYNC_OPTIONS=""

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5382bc9d/docs/_build/config-guide-version.yml
----------------------------------------------------------------------
diff --git a/docs/_build/config-guide-version.yml b/docs/_build/config-guide-version.yml
index 640f22f..49a6d7a 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-M2-incubating
   # BROOKLYN_VERSION_BELOW
-  style: /v/0.7.0-SNAPSHOT/style
+  style: /v/0.7.0-M2-incubating/style
   website: ""

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5382bc9d/docs/_build/make-javadoc.sh
----------------------------------------------------------------------
diff --git a/docs/_build/make-javadoc.sh b/docs/_build/make-javadoc.sh
index ccc1772..b1e61ad 100755
--- a/docs/_build/make-javadoc.sh
+++ b/docs/_build/make-javadoc.sh
@@ -20,7 +20,7 @@ rm -rf target/$JAVADOC_TARGET1_SUBPATH/
 
 export DATESTAMP=`date "+%Y-%m-%d"`
 # 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-M2-incubating-with-dependencies.jar
 echo "building javadoc at $DATESTAMP from:
 $SOURCE_PATHS"
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5382bc9d/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index 8e36167..7c9c358 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -43,7 +43,7 @@ exclude: ['/Gemfile*','/README.md']
 
 brooklyn-stable-version: 0.7.0-M2
 
-brooklyn-version: 0.7.0-SNAPSHOT # BROOKLYN_VERSION
+brooklyn-version: 0.7.0-M2-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/incubator-brooklyn/blob/5382bc9d/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 330b6d3..851d12b 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-M2-incubating</version>  <!-- BROOKLYN_VERSION -->
 	</dependency>
 </dependencies>
  

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5382bc9d/docs/guide/misc/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/misc/index.md b/docs/guide/misc/index.md
index 1f80f3f..8bb1e0f 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-M2-incubating Resources
 layout: website-normal
 children:
 - { title: Javadoc, path: javadoc/ }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5382bc9d/docs/guide/start/catalog.xml
----------------------------------------------------------------------
diff --git a/docs/guide/start/catalog.xml b/docs/guide/start/catalog.xml
index 6cff554..a440543 100644
--- a/docs/guide/start/catalog.xml
+++ b/docs/guide/start/catalog.xml
@@ -13,8 +13,8 @@
     </template>
     
     <classpath>
-      <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&amp;g=io.brooklyn.example&amp;a=brooklyn-example-simple-web-cluster&amp;v=0.7.0-SNAPSHOT&amp;e=jar</entry>
<!-- BROOKLYN_VERSION -->
-      <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&amp;g=io.brooklyn.example&amp;a=brooklyn-example-global-web-fabric&amp;v=0.7.0-SNAPSHOT&amp;e=jar</entry>
<!-- BROOKLYN_VERSION -->
+      <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&amp;g=io.brooklyn.example&amp;a=brooklyn-example-simple-web-cluster&amp;v=0.7.0-M2-incubating&amp;e=jar</entry>
<!-- BROOKLYN_VERSION -->
+      <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&amp;g=io.brooklyn.example&amp;a=brooklyn-example-global-web-fabric&amp;v=0.7.0-M2-incubating&amp;e=jar</entry>
<!-- BROOKLYN_VERSION -->
     </classpath>
 
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5382bc9d/docs/index.md
----------------------------------------------------------------------
diff --git a/docs/index.md b/docs/index.md
index 5d2c44b..a6a4da4 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-M2-incubating)
<!-- BROOKLYN_VERSION --></a>
 
 Also see the file <code>README.md</code> in this directory.
 


Mime
View raw message