[SPLITPREP] revert version to 0.9.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2ee1781b Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2ee1781b Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2ee1781b Branch: refs/heads/master Commit: 2ee1781bf7d01f80515f0217cffe8177b18b9b4c Parents: db7242a Author: Alex Heneveld <[email protected]> Authored: Mon Dec 21 12:25:50 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Dec 21 16:43:39 2015 +0000 ---------------------------------------------------------------------- brooklyn-dist/all/pom.xml | 2 +- brooklyn-dist/archetypes/quickstart/NOTES.txt | 2 +- brooklyn-dist/archetypes/quickstart/pom.xml | 2 +- .../archetypes/quickstart/src/brooklyn-sample/pom.xml | 2 +- brooklyn-dist/dist/pom.xml | 2 +- brooklyn-dist/downstream-parent/pom.xml | 4 ++-- brooklyn-dist/pom.xml | 4 ++-- brooklyn-docs/_build/build.sh | 4 ++-- brooklyn-docs/_build/config-guide-version.yml | 4 ++-- brooklyn-docs/_build/javadoc-overview.html | 4 ++-- brooklyn-docs/_config.yml | 2 +- brooklyn-docs/_extra/simple_java_examples/examples.md | 2 +- brooklyn-docs/_plugins/brooklyn_metadata.rb | 2 +- brooklyn-docs/guide/dev/env/maven-build.md | 8 ++++---- brooklyn-docs/guide/dev/tips/debugging-remote-brooklyn.md | 2 +- brooklyn-docs/guide/misc/index.md | 2 +- brooklyn-docs/guide/ops/rest.md | 4 ++-- brooklyn-docs/index.md | 2 +- .../committers/release-process/environment-variables.md | 2 +- brooklyn-library/examples/global-web-fabric/pom.xml | 2 +- brooklyn-library/examples/pom.xml | 2 +- brooklyn-library/examples/simple-messaging-pubsub/pom.xml | 2 +- brooklyn-library/examples/simple-nosql-cluster/pom.xml | 2 +- brooklyn-library/examples/simple-web-cluster/pom.xml | 2 +- brooklyn-library/examples/webapps/hello-world-sql/pom.xml | 2 +- brooklyn-library/examples/webapps/hello-world-webapp/pom.xml | 2 +- brooklyn-library/examples/webapps/pom.xml | 2 +- brooklyn-library/pom.xml | 6 +++--- brooklyn-library/qa/pom.xml | 2 +- brooklyn-library/qa/start-monitor.sh | 2 +- brooklyn-library/qa/start-webcluster.sh | 2 +- brooklyn-library/sandbox/cassandra-multicloud-snitch/pom.xml | 2 +- brooklyn-library/sandbox/database/pom.xml | 2 +- brooklyn-library/sandbox/extra/pom.xml | 2 +- brooklyn-library/sandbox/mobile-app/pom.xml | 2 +- brooklyn-library/sandbox/monitoring/pom.xml | 2 +- brooklyn-library/sandbox/nosql/pom.xml | 2 +- brooklyn-library/software/database/pom.xml | 2 +- brooklyn-library/software/messaging/pom.xml | 2 +- brooklyn-library/software/monitoring/pom.xml | 2 +- brooklyn-library/software/network/pom.xml | 2 +- brooklyn-library/software/nosql/pom.xml | 2 +- brooklyn-library/software/osgi/pom.xml | 2 +- brooklyn-library/software/webapp/pom.xml | 2 +- brooklyn-server/api/pom.xml | 2 +- brooklyn-server/camp/camp-base/pom.xml | 2 +- brooklyn-server/camp/camp-brooklyn/pom.xml | 2 +- brooklyn-server/camp/camp-server/pom.xml | 2 +- brooklyn-server/camp/pom.xml | 2 +- brooklyn-server/core/pom.xml | 2 +- .../main/java/org/apache/brooklyn/core/BrooklynVersion.java | 2 +- .../apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java | 4 ++-- brooklyn-server/karaf/apache-brooklyn/pom.xml | 2 +- brooklyn-server/karaf/commands/pom.xml | 2 +- brooklyn-server/karaf/features/pom.xml | 2 +- brooklyn-server/karaf/itest/pom.xml | 2 +- brooklyn-server/karaf/pom.xml | 2 +- brooklyn-server/launcher/pom.xml | 2 +- brooklyn-server/locations/jclouds/pom.xml | 2 +- brooklyn-server/logging/logback-includes/pom.xml | 2 +- brooklyn-server/logging/logback-xml/pom.xml | 2 +- brooklyn-server/parent/pom.xml | 2 +- brooklyn-server/policy/pom.xml | 2 +- brooklyn-server/pom.xml | 4 ++-- brooklyn-server/rest/rest-api/pom.xml | 2 +- brooklyn-server/rest/rest-client/pom.xml | 2 +- brooklyn-server/rest/rest-server/pom.xml | 2 +- brooklyn-server/server-cli/pom.xml | 2 +- .../src/main/resources/brooklyn/default.catalog.bom | 2 +- brooklyn-server/software/base/pom.xml | 2 +- .../apache/brooklyn/entity/brooklynnode/BrooklynNode.java | 2 +- .../brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java | 2 +- .../org/apache/brooklyn/entity/java/JmxmpSslSupport.java | 2 +- brooklyn-server/software/winrm/pom.xml | 2 +- brooklyn-server/storage/hazelcast/pom.xml | 2 +- brooklyn-server/test-framework/pom.xml | 4 ++-- brooklyn-server/test-support/pom.xml | 2 +- brooklyn-server/utils/common/pom.xml | 2 +- .../org/apache/brooklyn/util/maven/MavenArtifactTest.java | 4 ++-- brooklyn-server/utils/groovy/pom.xml | 2 +- brooklyn-server/utils/jmx/jmxmp-ssl-agent/pom.xml | 2 +- brooklyn-server/utils/jmx/jmxrmi-agent/pom.xml | 2 +- brooklyn-server/utils/rest-swagger/pom.xml | 2 +- brooklyn-server/utils/rt-felix/pom.xml | 2 +- brooklyn-server/utils/rt-osgi/pom.xml | 2 +- .../rt-osgi/src/test/dependencies/osgi/entities/pom.xml | 2 +- .../src/test/dependencies/osgi/more-entities-v1/pom.xml | 2 +- .../dependencies/osgi/more-entities-v2-evil-twin/pom.xml | 2 +- .../src/test/dependencies/osgi/more-entities-v2/pom.xml | 2 +- brooklyn-server/utils/test-support/pom.xml | 2 +- brooklyn-ui/pom.xml | 2 +- brooklyn-ui/src/main/webapp/assets/tpl/help/page.html | 2 +- brooklyn-ui/src/main/webapp/index.html | 2 +- brooklyn/pom.xml | 2 +- pom.xml | 2 +- 95 files changed, 110 insertions(+), 110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-dist/all/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/all/pom.xml b/brooklyn-dist/all/pom.xml index 46397b1..bcaa758 100644 --- a/brooklyn-dist/all/pom.xml +++ b/brooklyn-dist/all/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-dist/archetypes/quickstart/NOTES.txt ---------------------------------------------------------------------- diff --git a/brooklyn-dist/archetypes/quickstart/NOTES.txt b/brooklyn-dist/archetypes/quickstart/NOTES.txt index d195558..4028bf6 100644 --- a/brooklyn-dist/archetypes/quickstart/NOTES.txt +++ b/brooklyn-dist/archetypes/quickstart/NOTES.txt @@ -32,7 +32,7 @@ To test a build: pushd /tmp rm -rf brooklyn-sample - export BV=0.9.SPLITWIP-SNAPSHOT # BROOKLYN_VERSION + export BV=0.9.0-SNAPSHOT # BROOKLYN_VERSION mvn archetype:generate \ \ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-dist/archetypes/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/archetypes/quickstart/pom.xml b/brooklyn-dist/archetypes/quickstart/pom.xml index 7154f76..f47c395 100644 --- a/brooklyn-dist/archetypes/quickstart/pom.xml +++ b/brooklyn-dist/archetypes/quickstart/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../brooklyn-server/parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml b/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml index f879498..44f5f93 100644 --- a/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml +++ b/brooklyn-dist/archetypes/quickstart/src/brooklyn-sample/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-downstream-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <groupId>com.acme.sample</groupId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-dist/dist/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/pom.xml b/brooklyn-dist/dist/pom.xml index abc6522..a595094 100644 --- a/brooklyn-dist/dist/pom.xml +++ b/brooklyn-dist/dist/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-dist/downstream-parent/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/downstream-parent/pom.xml b/brooklyn-dist/downstream-parent/pom.xml index 9b7cc73..6a7d694 100644 --- a/brooklyn-dist/downstream-parent/pom.xml +++ b/brooklyn-dist/downstream-parent/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-server</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../brooklyn-server/pom.xml</relativePath> <!-- TODO this uses server root pom as a way to get version info without rat check; it means it inherits apache pom, which might not be desired. @@ -53,7 +53,7 @@ <excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups> <!-- Dependencies --> - <brooklyn.version>0.9.SPLITWIP-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <brooklyn.version>0.9.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- JCLOUDS_GROUPID_VERSION --> <!-- versions should match those used by Brooklyn, to avoid conflicts --> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-dist/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/pom.xml b/brooklyn-dist/pom.xml index 652738c..a2ecb3a 100644 --- a/brooklyn-dist/pom.xml +++ b/brooklyn-dist/pom.xml @@ -24,13 +24,13 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../brooklyn-server/parent/pom.xml</relativePath> </parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-dist-root</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>pom</packaging> <name>Brooklyn Dist Root</name> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/_build/build.sh ---------------------------------------------------------------------- diff --git a/brooklyn-docs/_build/build.sh b/brooklyn-docs/_build/build.sh index f8a3971..e5d196d 100755 --- a/brooklyn-docs/_build/build.sh +++ b/brooklyn-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.9.SPLITWIP-SNAPSHOT/" + echo "* guide-version : to build the guide only, in the versioned namespace /v/0.9.0-SNAPSHOT/" 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.9.SPLITWIP-SNAPSHOT + DIRS_TO_MOVE_TARGET[0]=v/0.9.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/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/_build/config-guide-version.yml ---------------------------------------------------------------------- diff --git a/brooklyn-docs/_build/config-guide-version.yml b/brooklyn-docs/_build/config-guide-version.yml index b151fec..9b910a9 100644 --- a/brooklyn-docs/_build/config-guide-version.yml +++ b/brooklyn-docs/_build/config-guide-version.yml @@ -1,6 +1,6 @@ path: # BROOKLYN_VERSION_BELOW - guide: /v/0.9.SPLITWIP-SNAPSHOT + guide: /v/0.9.0-SNAPSHOT # BROOKLYN_VERSION_BELOW - style: /v/0.9.SPLITWIP-SNAPSHOT/style + style: /v/0.9.0-SNAPSHOT/style website: "" http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/_build/javadoc-overview.html ---------------------------------------------------------------------- diff --git a/brooklyn-docs/_build/javadoc-overview.html b/brooklyn-docs/_build/javadoc-overview.html index ee3cd10..ef4819a 100644 --- a/brooklyn-docs/_build/javadoc-overview.html +++ b/brooklyn-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.9.SPLITWIP-SNAPSHOT +Javadoc for <a href="http://brooklyn.io";> Apache Brooklyn</a> 0.9.0-SNAPSHOT <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.9.SPLITWIP-SNAPS <p> <!-- BROOKLYN_VERSION_BELOW --> -This is the Javadoc for v 0.9.SPLITWIP-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}. +This is the Javadoc for v 0.9.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}. </p> </body><html> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/_config.yml ---------------------------------------------------------------------- diff --git a/brooklyn-docs/_config.yml b/brooklyn-docs/_config.yml index 8bfa2c5..7b634b2 100644 --- a/brooklyn-docs/_config.yml +++ b/brooklyn-docs/_config.yml @@ -47,7 +47,7 @@ sass: brooklyn-stable-version: 0.8.0-incubating -brooklyn-version: 0.9.SPLITWIP-SNAPSHOT # BROOKLYN_VERSION +brooklyn-version: 0.9.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/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/_extra/simple_java_examples/examples.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/_extra/simple_java_examples/examples.md b/brooklyn-docs/_extra/simple_java_examples/examples.md index 5293bec..334b2ec 100644 --- a/brooklyn-docs/_extra/simple_java_examples/examples.md +++ b/brooklyn-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.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/_plugins/brooklyn_metadata.rb ---------------------------------------------------------------------- diff --git a/brooklyn-docs/_plugins/brooklyn_metadata.rb b/brooklyn-docs/_plugins/brooklyn_metadata.rb index b76aeb9..ee0ba7b 100644 --- a/brooklyn-docs/_plugins/brooklyn_metadata.rb +++ b/brooklyn-docs/_plugins/brooklyn_metadata.rb @@ -7,7 +7,7 @@ # module BrooklynMetadata - BROOKLYN_VERSION = "0.9.SPLITWIP-SNAPSHOT" unless defined? BROOKLYN_VERSION + BROOKLYN_VERSION = "0.9.0-SNAPSHOT" unless defined? BROOKLYN_VERSION class Generator < Jekyll::Generator def generate(site) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/guide/dev/env/maven-build.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/guide/dev/env/maven-build.md b/brooklyn-docs/guide/dev/env/maven-build.md index e7f5c52..275cea2 100644 --- a/brooklyn-docs/guide/dev/env/maven-build.md +++ b/brooklyn-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.9.SPLITWIP-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.9.0-SNAPSHOT; 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.9.SPLITWIP-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.9.SPLITWIP-SNAPSHOT-dist.tar.gz -{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.9.SPLITWIP-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.9.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.9.0-SNAPSHOT-dist.tar.gz +{% comment %}BROOKLYN_VERSION{% endcomment %}[WARNING] Cannot include project artifact: io.brooklyn:brooklyn-dist:jar:0.9.0-SNAPSHOT; it doesn't have an associated file or directory. ... http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/guide/dev/tips/debugging-remote-brooklyn.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/guide/dev/tips/debugging-remote-brooklyn.md b/brooklyn-docs/guide/dev/tips/debugging-remote-brooklyn.md index e3c5129..2465f0b 100644 --- a/brooklyn-docs/guide/dev/tips/debugging-remote-brooklyn.md +++ b/brooklyn-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.9.SPLITWIP-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %} + "version": "0.9.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %} "buildSha1": "c0fdc15291702281acdebf1b11d431a6385f5224", "buildBranch": "UNKNOWN" } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/guide/misc/index.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/guide/misc/index.md b/brooklyn-docs/guide/misc/index.md index 3ecb4ac..fab2222 100644 --- a/brooklyn-docs/guide/misc/index.md +++ b/brooklyn-docs/guide/misc/index.md @@ -1,6 +1,6 @@ --- # BROOKLYN_VERSION_BELOW -title: Other 0.9.SPLITWIP-SNAPSHOT Resources +title: Other 0.9.0-SNAPSHOT Resources layout: website-normal children: - { title: Javadoc, path: javadoc/ } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/guide/ops/rest.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/guide/ops/rest.md b/brooklyn-docs/guide/ops/rest.md index 4c9712f..c1d7b64 100644 --- a/brooklyn-docs/guide/ops/rest.md +++ b/brooklyn-docs/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.9.SPLITWIP-SNAPSHOT + http://localhost:8081/#v1/catalog/entities/cluster:0.9.0-SNAPSHOT And in the REST API it is accessed at: <!-- BROOKLYN_VERSION_BELOW --> - http://localhost:8081/v1/catalog/entities/cluster:0.9.SPLITWIP-SNAPSHOT + http://localhost:8081/v1/catalog/entities/cluster:0.9.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/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/index.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/index.md b/brooklyn-docs/index.md index 1454c72..37015c5 100644 --- a/brooklyn-docs/index.md +++ b/brooklyn-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.9.SPLITWIP-SNAPSHOT) <!-- BROOKLYN_VERSION --></a> +* <a href="{{ site.path.guide }}/">the brooklyn user guide (version 0.9.0-SNAPSHOT) <!-- BROOKLYN_VERSION --></a> Also see the file <code>README.md</code> in this directory. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-docs/website/developers/committers/release-process/environment-variables.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/website/developers/committers/release-process/environment-variables.md b/brooklyn-docs/website/developers/committers/release-process/environment-variables.md index 9baa7af..886d3c7 100644 --- a/brooklyn-docs/website/developers/committers/release-process/environment-variables.md +++ b/brooklyn-docs/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.9.SPLITWIP-SNAPSHOT +OLD_MASTER_VERSION=0.9.0-SNAPSHOT # The next version to be set on the master branch NEW_MASTER_VERSION=0.NNN+1.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/examples/global-web-fabric/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/examples/global-web-fabric/pom.xml b/brooklyn-library/examples/global-web-fabric/pom.xml index 33fba4d..2ddda90 100644 --- a/brooklyn-library/examples/global-web-fabric/pom.xml +++ b/brooklyn-library/examples/global-web-fabric/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/examples/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/examples/pom.xml b/brooklyn-library/examples/pom.xml index 0152a84..08a2070 100644 --- a/brooklyn-library/examples/pom.xml +++ b/brooklyn-library/examples/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/examples/simple-messaging-pubsub/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/examples/simple-messaging-pubsub/pom.xml b/brooklyn-library/examples/simple-messaging-pubsub/pom.xml index 8efb62b..094675d 100644 --- a/brooklyn-library/examples/simple-messaging-pubsub/pom.xml +++ b/brooklyn-library/examples/simple-messaging-pubsub/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/examples/simple-nosql-cluster/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/examples/simple-nosql-cluster/pom.xml b/brooklyn-library/examples/simple-nosql-cluster/pom.xml index df8ae5f..7ecfc8c 100644 --- a/brooklyn-library/examples/simple-nosql-cluster/pom.xml +++ b/brooklyn-library/examples/simple-nosql-cluster/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/examples/simple-web-cluster/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/examples/simple-web-cluster/pom.xml b/brooklyn-library/examples/simple-web-cluster/pom.xml index 982cda0..378ffbb 100644 --- a/brooklyn-library/examples/simple-web-cluster/pom.xml +++ b/brooklyn-library/examples/simple-web-cluster/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/examples/webapps/hello-world-sql/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/examples/webapps/hello-world-sql/pom.xml b/brooklyn-library/examples/webapps/hello-world-sql/pom.xml index e08ff3f..19ff3ed 100644 --- a/brooklyn-library/examples/webapps/hello-world-sql/pom.xml +++ b/brooklyn-library/examples/webapps/hello-world-sql/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-webapps-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/examples/webapps/hello-world-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/examples/webapps/hello-world-webapp/pom.xml b/brooklyn-library/examples/webapps/hello-world-webapp/pom.xml index 15734d7..559260e 100644 --- a/brooklyn-library/examples/webapps/hello-world-webapp/pom.xml +++ b/brooklyn-library/examples/webapps/hello-world-webapp/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-webapps-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/examples/webapps/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/examples/webapps/pom.xml b/brooklyn-library/examples/webapps/pom.xml index 242eb44..d5c0c05 100644 --- a/brooklyn-library/examples/webapps/pom.xml +++ b/brooklyn-library/examples/webapps/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/pom.xml b/brooklyn-library/pom.xml index 9c5eb5a..c89d7a1 100644 --- a/brooklyn-library/pom.xml +++ b/brooklyn-library/pom.xml @@ -24,13 +24,13 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../brooklyn-server/parent/</relativePath> </parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>pom</packaging> <name>Brooklyn Library Root</name> @@ -73,7 +73,7 @@ </mailingLists> <properties> - <brooklyn.version>0.9.SPLITWIP-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <brooklyn.version>0.9.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> <!-- Compilation --> <java.version>1.7</java.version> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/qa/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/qa/pom.xml b/brooklyn-library/qa/pom.xml index e9fe0c4..e38afd1 100644 --- a/brooklyn-library/qa/pom.xml +++ b/brooklyn-library/qa/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/qa/start-monitor.sh ---------------------------------------------------------------------- diff --git a/brooklyn-library/qa/start-monitor.sh b/brooklyn-library/qa/start-monitor.sh index 9568269..0fa8247 100755 --- a/brooklyn-library/qa/start-monitor.sh +++ b/brooklyn-library/qa/start-monitor.sh @@ -25,7 +25,7 @@ #set -x # debug CLASS=org.apache.brooklyn.qa.longevity.Monitor -VERSION=0.9.SPLITWIP-SNAPSHOT # BROOKLYN_VERSION +VERSION=0.9.0-SNAPSHOT # BROOKLYN_VERSION ROOT=$(cd $(dirname $0) && pwd) cd $ROOT http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/qa/start-webcluster.sh ---------------------------------------------------------------------- diff --git a/brooklyn-library/qa/start-webcluster.sh b/brooklyn-library/qa/start-webcluster.sh index 828e582..7aa678a 100755 --- a/brooklyn-library/qa/start-webcluster.sh +++ b/brooklyn-library/qa/start-webcluster.sh @@ -25,7 +25,7 @@ #set -x # debug CLASS=org.apache.brooklyn.qa.longevity.webcluster.WebClusterApp -VERSION=0.9.SPLITWIP-SNAPSHOT # BROOKLYN_VERSION +VERSION=0.9.0-SNAPSHOT # BROOKLYN_VERSION ROOT=$(cd $(dirname $0) && pwd) cd $ROOT http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/sandbox/cassandra-multicloud-snitch/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/sandbox/cassandra-multicloud-snitch/pom.xml b/brooklyn-library/sandbox/cassandra-multicloud-snitch/pom.xml index ea1973e..0030abc 100644 --- a/brooklyn-library/sandbox/cassandra-multicloud-snitch/pom.xml +++ b/brooklyn-library/sandbox/cassandra-multicloud-snitch/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/sandbox/database/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/sandbox/database/pom.xml b/brooklyn-library/sandbox/database/pom.xml index d626c37..28ef7a0 100644 --- a/brooklyn-library/sandbox/database/pom.xml +++ b/brooklyn-library/sandbox/database/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/sandbox/extra/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/sandbox/extra/pom.xml b/brooklyn-library/sandbox/extra/pom.xml index c19cb3c..a84dda4 100644 --- a/brooklyn-library/sandbox/extra/pom.xml +++ b/brooklyn-library/sandbox/extra/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/sandbox/mobile-app/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/sandbox/mobile-app/pom.xml b/brooklyn-library/sandbox/mobile-app/pom.xml index 0759d7e..e350e53 100644 --- a/brooklyn-library/sandbox/mobile-app/pom.xml +++ b/brooklyn-library/sandbox/mobile-app/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/sandbox/monitoring/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/sandbox/monitoring/pom.xml b/brooklyn-library/sandbox/monitoring/pom.xml index 8674d04..fb2df08 100644 --- a/brooklyn-library/sandbox/monitoring/pom.xml +++ b/brooklyn-library/sandbox/monitoring/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/sandbox/nosql/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/sandbox/nosql/pom.xml b/brooklyn-library/sandbox/nosql/pom.xml index 0d6b84c..c68f79d 100644 --- a/brooklyn-library/sandbox/nosql/pom.xml +++ b/brooklyn-library/sandbox/nosql/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/software/database/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/database/pom.xml b/brooklyn-library/software/database/pom.xml index f09e7af..11cfcdb 100644 --- a/brooklyn-library/software/database/pom.xml +++ b/brooklyn-library/software/database/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/software/messaging/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/messaging/pom.xml b/brooklyn-library/software/messaging/pom.xml index 15f4db7..83e7ef0 100644 --- a/brooklyn-library/software/messaging/pom.xml +++ b/brooklyn-library/software/messaging/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/software/monitoring/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/monitoring/pom.xml b/brooklyn-library/software/monitoring/pom.xml index dd3bbab..299d788 100644 --- a/brooklyn-library/software/monitoring/pom.xml +++ b/brooklyn-library/software/monitoring/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/software/network/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/network/pom.xml b/brooklyn-library/software/network/pom.xml index 1675a73..3c785e6 100644 --- a/brooklyn-library/software/network/pom.xml +++ b/brooklyn-library/software/network/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/software/nosql/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/nosql/pom.xml b/brooklyn-library/software/nosql/pom.xml index 6a50319..f409e4b 100644 --- a/brooklyn-library/software/nosql/pom.xml +++ b/brooklyn-library/software/nosql/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/software/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/osgi/pom.xml b/brooklyn-library/software/osgi/pom.xml index 778dee1..c1611df 100644 --- a/brooklyn-library/software/osgi/pom.xml +++ b/brooklyn-library/software/osgi/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-library/software/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/pom.xml b/brooklyn-library/software/webapp/pom.xml index 6350d32..b6cbe14 100644 --- a/brooklyn-library/software/webapp/pom.xml +++ b/brooklyn-library/software/webapp/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/api/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/api/pom.xml b/brooklyn-server/api/pom.xml index 9e5b2e0..f1994f4 100644 --- a/brooklyn-server/api/pom.xml +++ b/brooklyn-server/api/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/camp/camp-base/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-base/pom.xml b/brooklyn-server/camp/camp-base/pom.xml index c9410f5..063f665 100644 --- a/brooklyn-server/camp/camp-base/pom.xml +++ b/brooklyn-server/camp/camp-base/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn.camp</groupId> <artifactId>camp-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/camp/camp-brooklyn/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-brooklyn/pom.xml b/brooklyn-server/camp/camp-brooklyn/pom.xml index fb5b68e..b818b99 100644 --- a/brooklyn-server/camp/camp-brooklyn/pom.xml +++ b/brooklyn-server/camp/camp-brooklyn/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/camp/camp-server/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-server/pom.xml b/brooklyn-server/camp/camp-server/pom.xml index a41c30a..502c83e 100644 --- a/brooklyn-server/camp/camp-server/pom.xml +++ b/brooklyn-server/camp/camp-server/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn.camp</groupId> <artifactId>camp-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/camp/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/pom.xml b/brooklyn-server/camp/pom.xml index bcce5ff..579c473 100644 --- a/brooklyn-server/camp/pom.xml +++ b/brooklyn-server/camp/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/core/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/core/pom.xml b/brooklyn-server/core/pom.xml index c1bde6e..3be573d 100644 --- a/brooklyn-server/core/pom.xml +++ b/brooklyn-server/core/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java index e2f4b9d..3e0a1a7 100644 --- a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java +++ b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java @@ -80,7 +80,7 @@ public class BrooklynVersion { // may be useful: // private static final String OSGI_BRANCH_PROPERTY_NAME = "Implementation-Branch"; - private final static String VERSION_FROM_STATIC = "0.9.SPLITWIP-SNAPSHOT"; // BROOKLYN_VERSION + private final static String VERSION_FROM_STATIC = "0.9.0-SNAPSHOT"; // BROOKLYN_VERSION private static final AtomicReference<Boolean> IS_DEV_ENV = new AtomicReference<Boolean>(); private static final String BROOKLYN_FEATURE_PREFIX = "Brooklyn-Feature-"; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java b/brooklyn-server/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java index db0a29a..524e248 100644 --- a/brooklyn-server/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java +++ b/brooklyn-server/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java @@ -87,7 +87,7 @@ public class OsgiStandaloneTest extends OsgiTestBase { @Test public void testDuplicateBundle() throws Exception { - MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.9.SPLITWIP-SNAPSHOT"); // BROOKLYN_VERSION + MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.9.0-SNAPSHOT"); // BROOKLYN_VERSION String localUrl = MavenRetriever.localUrl(artifact); if ("file".equals(Urls.getProtocol(localUrl))) { helperDuplicateBundle(localUrl); @@ -98,7 +98,7 @@ public class OsgiStandaloneTest extends OsgiTestBase { @Test(groups="Integration") public void testRemoteDuplicateBundle() throws Exception { - helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.9.SPLITWIP-SNAPSHOT"))); // BROOKLYN_VERSION + helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.9.0-SNAPSHOT"))); // BROOKLYN_VERSION } public void helperDuplicateBundle(String url) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/karaf/apache-brooklyn/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/karaf/apache-brooklyn/pom.xml b/brooklyn-server/karaf/apache-brooklyn/pom.xml index 00fbe78..89ab390 100755 --- a/brooklyn-server/karaf/apache-brooklyn/pom.xml +++ b/brooklyn-server/karaf/apache-brooklyn/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-karaf</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/karaf/commands/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/karaf/commands/pom.xml b/brooklyn-server/karaf/commands/pom.xml index ae5852d..7918d2e 100644 --- a/brooklyn-server/karaf/commands/pom.xml +++ b/brooklyn-server/karaf/commands/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-karaf</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/karaf/features/pom.xml b/brooklyn-server/karaf/features/pom.xml index f5d06d8..03cd932 100755 --- a/brooklyn-server/karaf/features/pom.xml +++ b/brooklyn-server/karaf/features/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-karaf</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <artifactId>brooklyn-features</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/karaf/itest/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/karaf/itest/pom.xml b/brooklyn-server/karaf/itest/pom.xml index 49e5869..0b016a3 100644 --- a/brooklyn-server/karaf/itest/pom.xml +++ b/brooklyn-server/karaf/itest/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-karaf</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/karaf/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/karaf/pom.xml b/brooklyn-server/karaf/pom.xml index 1014be4..9d4d07a 100644 --- a/brooklyn-server/karaf/pom.xml +++ b/brooklyn-server/karaf/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-server</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/launcher/pom.xml b/brooklyn-server/launcher/pom.xml index 1d7f726..8d847cd 100644 --- a/brooklyn-server/launcher/pom.xml +++ b/brooklyn-server/launcher/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/locations/jclouds/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/jclouds/pom.xml b/brooklyn-server/locations/jclouds/pom.xml index efe1284..3338893 100644 --- a/brooklyn-server/locations/jclouds/pom.xml +++ b/brooklyn-server/locations/jclouds/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/logging/logback-includes/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/logging/logback-includes/pom.xml b/brooklyn-server/logging/logback-includes/pom.xml index 7bc1768..dad78b5 100644 --- a/brooklyn-server/logging/logback-includes/pom.xml +++ b/brooklyn-server/logging/logback-includes/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/logging/logback-xml/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/logging/logback-xml/pom.xml b/brooklyn-server/logging/logback-xml/pom.xml index c58e72d..0861ee5 100644 --- a/brooklyn-server/logging/logback-xml/pom.xml +++ b/brooklyn-server/logging/logback-xml/pom.xml @@ -38,7 +38,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/parent/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/parent/pom.xml b/brooklyn-server/parent/pom.xml index 2dbe2eb..b98d412 100644 --- a/brooklyn-server/parent/pom.xml +++ b/brooklyn-server/parent/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-server</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <artifactId>brooklyn-parent</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/policy/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/policy/pom.xml b/brooklyn-server/policy/pom.xml index ffb0048..c28e39f 100644 --- a/brooklyn-server/policy/pom.xml +++ b/brooklyn-server/policy/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/pom.xml b/brooklyn-server/pom.xml index e921872..ec22b36 100644 --- a/brooklyn-server/pom.xml +++ b/brooklyn-server/pom.xml @@ -30,7 +30,7 @@ <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-server</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>pom</packaging> <name>Brooklyn Server Root</name> @@ -73,7 +73,7 @@ </mailingLists> <properties> - <brooklyn.version>0.9.SPLITWIP-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <brooklyn.version>0.9.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> <!-- Compilation --> <java.version>1.7</java.version> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/rest/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/rest/rest-api/pom.xml b/brooklyn-server/rest/rest-api/pom.xml index 312c4c7..81306e5 100644 --- a/brooklyn-server/rest/rest-api/pom.xml +++ b/brooklyn-server/rest/rest-api/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/rest/rest-client/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/rest/rest-client/pom.xml b/brooklyn-server/rest/rest-client/pom.xml index 53a3990..5b27148 100644 --- a/brooklyn-server/rest/rest-client/pom.xml +++ b/brooklyn-server/rest/rest-client/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/rest/rest-server/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/rest/rest-server/pom.xml b/brooklyn-server/rest/rest-server/pom.xml index 2c107ed..fdee3a5 100644 --- a/brooklyn-server/rest/rest-server/pom.xml +++ b/brooklyn-server/rest/rest-server/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/server-cli/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/server-cli/pom.xml b/brooklyn-server/server-cli/pom.xml index 531b1fe..3e4c6ea 100644 --- a/brooklyn-server/server-cli/pom.xml +++ b/brooklyn-server/server-cli/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom ---------------------------------------------------------------------- diff --git a/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom b/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom index 85a695a..483f04d 100644 --- a/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom +++ b/brooklyn-server/server-cli/src/main/resources/brooklyn/default.catalog.bom @@ -3,7 +3,7 @@ # and templates to get started using Brooklyn brooklyn.catalog: - version: 0.9.SPLITWIP-SNAPSHOT # BROOKLYN_VERSION + version: 0.9.0-SNAPSHOT # BROOKLYN_VERSION items: # load everything in the classpath with a @Catalog annotation http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/software/base/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/software/base/pom.xml b/brooklyn-server/software/base/pom.xml index 89dbcaa..556e982 100644 --- a/brooklyn-server/software/base/pom.xml +++ b/brooklyn-server/software/base/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java index 3861bae..55c2e27 100644 --- a/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java +++ b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java @@ -65,7 +65,7 @@ public interface BrooklynNode extends SoftwareProcess, UsesJava { new TypeToken<Map<String,String>>() {}, "brooklynnode.copytorundir", "URLs of resources to be copied across to the server, giving the path they are to be copied to", MutableMap.<String,String>of()); @SetFromFlag("version") - public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "0.9.SPLITWIP-SNAPSHOT"); // BROOKLYN_VERSION + public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "0.9.0-SNAPSHOT"); // BROOKLYN_VERSION @SetFromFlag("distroUploadUrl") public static final ConfigKey<String> DISTRO_UPLOAD_URL = ConfigKeys.newStringConfigKey( http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java index 860996c..8058d0f 100644 --- a/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java +++ b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java @@ -128,7 +128,7 @@ public class BrooklynNodeSshDriver extends JavaSoftwareProcessSshDriver implemen // Need to explicitly give file, because for snapshot URLs you don't get a clean filename from the URL. // This filename is used to generate the first URL to try: [BROOKLYN_VERSION_BELOW] - // file://$HOME/.brooklyn/repository/BrooklynNode/0.9.SPLITWIP-SNAPSHOT/brooklynnode-0.8.0-snapshot.tar.gz + // file://$HOME/.brooklyn/repository/BrooklynNode/0.9.0-SNAPSHOT/brooklynnode-0.8.0-snapshot.tar.gz // (DOWNLOAD_URL overrides this and has a default which comes from maven) List<String> urls = resolver.getTargets(); String saveAs = resolver.getFilename(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java index ea5f3ac..40321ef 100644 --- a/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java +++ b/brooklyn-server/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java @@ -38,7 +38,7 @@ import com.google.common.base.Preconditions; public class JmxmpSslSupport { - final static String BROOKLYN_VERSION = "0.9.SPLITWIP-SNAPSHOT"; // BROOKLYN_VERSION (updated by script) + final static String BROOKLYN_VERSION = "0.9.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script) private final JmxSupport jmxSupport; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/software/winrm/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/software/winrm/pom.xml b/brooklyn-server/software/winrm/pom.xml index fa1c801..5bde35e 100644 --- a/brooklyn-server/software/winrm/pom.xml +++ b/brooklyn-server/software/winrm/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/storage/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/storage/hazelcast/pom.xml b/brooklyn-server/storage/hazelcast/pom.xml index c5106d3..a15b173 100644 --- a/brooklyn-server/storage/hazelcast/pom.xml +++ b/brooklyn-server/storage/hazelcast/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/test-framework/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/test-framework/pom.xml b/brooklyn-server/test-framework/pom.xml index aa1bc35..1d334a6 100644 --- a/brooklyn-server/test-framework/pom.xml +++ b/brooklyn-server/test-framework/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>brooklyn-parent</artifactId> <groupId>org.apache.brooklyn</groupId> - <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -93,4 +93,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/test-support/pom.xml b/brooklyn-server/test-support/pom.xml index e326117..4397900 100644 --- a/brooklyn-server/test-support/pom.xml +++ b/brooklyn-server/test-support/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/common/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/common/pom.xml b/brooklyn-server/utils/common/pom.xml index 29723b2..037dcd9 100644 --- a/brooklyn-server/utils/common/pom.xml +++ b/brooklyn-server/utils/common/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java b/brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java index dcfb0e9..ae9d5bd 100644 --- a/brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java +++ b/brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java @@ -41,7 +41,7 @@ public class MavenArtifactTest { // only *integration* tests require these to be *installed*; // note this may vary from machine to machine so version should be aligned with that in parent pom final static String MAVEN_JAR_PLUGIN_COORDINATE = "org.apache.maven.plugins:maven-jar-plugin:jar:2.6"; - final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:0.9.SPLITWIP-SNAPSHOT"; // BROOKLYN_VERSION + final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:0.9.0-SNAPSHOT"; // BROOKLYN_VERSION // Don't need to be installed, only used as examples final static String RELEASED_SOURCES_COORDINATE = "io.brooklyn:brooklyn-core:jar:sources:0.6.0"; @@ -248,7 +248,7 @@ public class MavenArtifactTest { @Test(groups={"Integration","Broken"}) public void testRetrievalHostedSnapshotIntegration() throws Exception { MavenArtifact m = MavenArtifact.fromCoordinate( - "org.apache.brooklyn:brooklyn-utils-common:jar:0.9.SPLITWIP-SNAPSHOT"); // BROOKLYN_VERSION + "org.apache.brooklyn:brooklyn-utils-common:jar:0.9.0-SNAPSHOT"); // BROOKLYN_VERSION String localPath = new MavenRetriever().getLocalPath(m); File f = new File(localPath); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/groovy/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/groovy/pom.xml b/brooklyn-server/utils/groovy/pom.xml index 3f0b6a4..f25e30f 100644 --- a/brooklyn-server/utils/groovy/pom.xml +++ b/brooklyn-server/utils/groovy/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/jmx/jmxmp-ssl-agent/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/jmx/jmxmp-ssl-agent/pom.xml b/brooklyn-server/utils/jmx/jmxmp-ssl-agent/pom.xml index d16e59b..930f0a3 100644 --- a/brooklyn-server/utils/jmx/jmxmp-ssl-agent/pom.xml +++ b/brooklyn-server/utils/jmx/jmxmp-ssl-agent/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/jmx/jmxrmi-agent/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/jmx/jmxrmi-agent/pom.xml b/brooklyn-server/utils/jmx/jmxrmi-agent/pom.xml index 1d7c43a..c11f417 100644 --- a/brooklyn-server/utils/jmx/jmxrmi-agent/pom.xml +++ b/brooklyn-server/utils/jmx/jmxrmi-agent/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/rest-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/rest-swagger/pom.xml b/brooklyn-server/utils/rest-swagger/pom.xml index 2ba4810..6f9a86f 100644 --- a/brooklyn-server/utils/rest-swagger/pom.xml +++ b/brooklyn-server/utils/rest-swagger/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/rt-felix/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/rt-felix/pom.xml b/brooklyn-server/utils/rt-felix/pom.xml index c33ec74..147e1de 100644 --- a/brooklyn-server/utils/rt-felix/pom.xml +++ b/brooklyn-server/utils/rt-felix/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/rt-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/rt-osgi/pom.xml b/brooklyn-server/utils/rt-osgi/pom.xml index 8b75609..2cac7f0 100644 --- a/brooklyn-server/utils/rt-osgi/pom.xml +++ b/brooklyn-server/utils/rt-osgi/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/entities/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/entities/pom.xml b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/entities/pom.xml index 03bc76b..d391f34 100644 --- a/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/entities/pom.xml +++ b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/entities/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v1/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v1/pom.xml b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v1/pom.xml index d951388..000c5cd 100644 --- a/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v1/pom.xml +++ b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v1/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml index eafa061..9ad32fe 100644 --- a/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml +++ b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v2/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v2/pom.xml b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v2/pom.xml index e30549c..4b4a4fb 100644 --- a/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v2/pom.xml +++ b/brooklyn-server/utils/rt-osgi/src/test/dependencies/osgi/more-entities-v2/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-server/utils/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/test-support/pom.xml b/brooklyn-server/utils/test-support/pom.xml index d4cc610..8aacbe1 100644 --- a/brooklyn-server/utils/test-support/pom.xml +++ b/brooklyn-server/utils/test-support/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-ui/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-ui/pom.xml b/brooklyn-ui/pom.xml index a0d331d..29abd5b 100644 --- a/brooklyn-ui/pom.xml +++ b/brooklyn-ui/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-jsgui</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>war</packaging> <name>Brooklyn REST JavaScript Web GUI</name> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-ui/src/main/webapp/assets/tpl/help/page.html ---------------------------------------------------------------------- diff --git a/brooklyn-ui/src/main/webapp/assets/tpl/help/page.html b/brooklyn-ui/src/main/webapp/assets/tpl/help/page.html index e413e06..c8e5c8a 100644 --- a/brooklyn-ui/src/main/webapp/assets/tpl/help/page.html +++ b/brooklyn-ui/src/main/webapp/assets/tpl/help/page.html @@ -28,7 +28,7 @@ under the License. Brooklyn is an Apache-licensed open-source project for deployment and management. </p> - <p>You are currently using Brooklyn Version 0.9.SPLITWIP-SNAPSHOT.</p> <!-- BROOKLYN_VERSION --> + <p>You are currently using Brooklyn Version 0.9.0-SNAPSHOT.</p> <!-- BROOKLYN_VERSION --> <hr/> Some useful references include: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn-ui/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/brooklyn-ui/src/main/webapp/index.html b/brooklyn-ui/src/main/webapp/index.html index d53ebd8..a7c8121 100644 --- a/brooklyn-ui/src/main/webapp/index.html +++ b/brooklyn-ui/src/main/webapp/index.html @@ -45,7 +45,7 @@ <div class="navbar-inner"> <div class="userName-top"><span id="user"></span> | <a href="/logout" id="logout-link">Log out</a></div> <div class="container"> - <a class="logo" href="#" title="Brooklyn, Version 0.9.SPLITWIP-SNAPSHOT"><!-- Logo added via CSS --></a> <!-- BROOKLYN_VERSION --> + <a class="logo" href="#" title="Brooklyn, Version 0.9.0-SNAPSHOT"><!-- Logo added via CSS --></a> <!-- BROOKLYN_VERSION --> <div class="menubar-top"> <ul class="nav"> <li><a href="#v1/home" class="nav1 nav1_home">Home</a></li> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/brooklyn/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn/pom.xml b/brooklyn/pom.xml index 9e0a5eb..25e18f1 100644 --- a/brooklyn/pom.xml +++ b/brooklyn/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>pom</packaging> <name>Brooklyn Root</name> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2ee1781b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 008a67c..81a42e0 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn</artifactId> - <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>pom</packaging> <name>Brooklyn Root</name>
