[SPLITPREP] brookly version 0.9.SPLITWIP-SNAPSHOT for test purposes
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3d793007 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3d793007 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3d793007 Branch: refs/heads/master Commit: 3d793007a567831fd1f219189b20f2c49cc55cea Parents: faa6a9d Author: John McCabe <[email protected]> Authored: Wed Dec 16 12:00:20 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Dec 21 16:43:33 2015 +0000 ---------------------------------------------------------------------- brooklyn-dist/all/pom.xml | 2 +- brooklyn-dist/archetypes/quickstart/NOTES.txt | 2 +- brooklyn-dist/archetypes/quickstart/pom.xml | 2 +- .../quickstart/src/brooklyn-sample/pom.xml | 2 +- brooklyn-dist/dist/pom.xml | 2 +- brooklyn-dist/downstream-parent/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 +- .../_extra/simple_java_examples/examples.md | 2 +- brooklyn-docs/_plugins/brooklyn_metadata.rb | 2 +- brooklyn-docs/guide/dev/env/maven-build.md | 8 ++--- .../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 +- .../release-process/environment-variables.md | 2 +- brooklyn-docs/website/meta/versions.md | 4 +-- .../examples/global-web-fabric/pom.xml | 2 +- brooklyn-library/examples/pom.xml | 2 +- .../examples/simple-messaging-pubsub/pom.xml | 2 +- .../examples/simple-nosql-cluster/pom.xml | 2 +- .../examples/simple-web-cluster/pom.xml | 2 +- .../examples/webapps/hello-world-sql/pom.xml | 2 +- .../examples/webapps/hello-world-webapp/pom.xml | 2 +- brooklyn-library/examples/webapps/pom.xml | 2 +- brooklyn-library/qa/pom.xml | 2 +- brooklyn-library/qa/start-monitor.sh | 2 +- brooklyn-library/qa/start-webcluster.sh | 2 +- .../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 +- .../apache/brooklyn/core/BrooklynVersion.java | 2 +- .../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 +- .../features/src/main/history/dependencies.xml | 32 ++++++++++---------- 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 +- .../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/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 +- .../main/resources/brooklyn/default.catalog.bom | 2 +- brooklyn-server/software/base/pom.xml | 2 +- .../entity/brooklynnode/BrooklynNode.java | 2 +- .../brooklynnode/BrooklynNodeSshDriver.java | 2 +- .../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 | 2 +- brooklyn-server/test-support/pom.xml | 2 +- brooklyn-server/utils/common/pom.xml | 2 +- .../brooklyn/util/maven/MavenArtifactTest.java | 6 ++-- brooklyn-server/utils/groovy/pom.xml | 2 +- .../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 +- .../src/test/dependencies/osgi/entities/pom.xml | 2 +- .../dependencies/osgi/more-entities-v1/pom.xml | 2 +- .../osgi/more-entities-v2-evil-twin/pom.xml | 2 +- .../dependencies/osgi/more-entities-v2/pom.xml | 2 +- brooklyn-server/utils/test-support/pom.xml | 2 +- brooklyn-ui/pom.xml | 2 +- .../src/main/webapp/assets/tpl/help/page.html | 2 +- brooklyn-ui/src/main/webapp/index.html | 2 +- pom.xml | 4 +-- 93 files changed, 121 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-dist/all/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/all/pom.xml b/brooklyn-dist/all/pom.xml index 289d4a6..c257f0e 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-dist/archetypes/quickstart/NOTES.txt ---------------------------------------------------------------------- diff --git a/brooklyn-dist/archetypes/quickstart/NOTES.txt b/brooklyn-dist/archetypes/quickstart/NOTES.txt index 4028bf6..d195558 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.0-SNAPSHOT # BROOKLYN_VERSION + export BV=0.9.SPLITWIP-SNAPSHOT # BROOKLYN_VERSION mvn archetype:generate \ \ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-dist/archetypes/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/archetypes/quickstart/pom.xml b/brooklyn-dist/archetypes/quickstart/pom.xml index 6caa79e..1594181 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 44f5f93..f879498 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <groupId>com.acme.sample</groupId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-dist/dist/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/dist/pom.xml b/brooklyn-dist/dist/pom.xml index d9c392a..eda7daf 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-dist/downstream-parent/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-dist/downstream-parent/pom.xml b/brooklyn-dist/downstream-parent/pom.xml index c1731fd..027c1bf 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</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> @@ -48,7 +48,7 @@ <excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups> <!-- Dependencies --> - <brooklyn.version>0.9.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <brooklyn.version>0.9.SPLITWIP-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/3d793007/brooklyn-docs/_build/build.sh ---------------------------------------------------------------------- diff --git a/brooklyn-docs/_build/build.sh b/brooklyn-docs/_build/build.sh index e5d196d..f8a3971 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.0-SNAPSHOT/" + echo "* guide-version : to build the guide only, in the versioned namespace /v/0.9.SPLITWIP-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.0-SNAPSHOT + DIRS_TO_MOVE_TARGET[0]=v/0.9.SPLITWIP-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/3d793007/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 9b910a9..b151fec 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.0-SNAPSHOT + guide: /v/0.9.SPLITWIP-SNAPSHOT # BROOKLYN_VERSION_BELOW - style: /v/0.9.0-SNAPSHOT/style + style: /v/0.9.SPLITWIP-SNAPSHOT/style website: "" http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-docs/_build/javadoc-overview.html ---------------------------------------------------------------------- diff --git a/brooklyn-docs/_build/javadoc-overview.html b/brooklyn-docs/_build/javadoc-overview.html index ef4819a..ee3cd10 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.0-SNAPSHOT +Javadoc for <a href="http://brooklyn.io";> Apache Brooklyn</a> 0.9.SPLITWIP-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.0-SNAPSHOT <p> <!-- BROOKLYN_VERSION_BELOW --> -This is the Javadoc for v 0.9.0-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}. +This is the Javadoc for v 0.9.SPLITWIP-SNAPSHOT (git SHA1 hash ${SHA1STAMP}) auto-generated on ${DATESTAMP}. </p> </body><html> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-docs/_config.yml ---------------------------------------------------------------------- diff --git a/brooklyn-docs/_config.yml b/brooklyn-docs/_config.yml index 7b634b2..8bfa2c5 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.0-SNAPSHOT # BROOKLYN_VERSION +brooklyn-version: 0.9.SPLITWIP-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/3d793007/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 334b2ec..5293bec 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-docs/_plugins/brooklyn_metadata.rb ---------------------------------------------------------------------- diff --git a/brooklyn-docs/_plugins/brooklyn_metadata.rb b/brooklyn-docs/_plugins/brooklyn_metadata.rb index ee0ba7b..b76aeb9 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.0-SNAPSHOT" unless defined? BROOKLYN_VERSION + BROOKLYN_VERSION = "0.9.SPLITWIP-SNAPSHOT" unless defined? BROOKLYN_VERSION class Generator < Jekyll::Generator def generate(site) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 275cea2..e7f5c52 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.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.9.SPLITWIP-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.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. +{% 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. ... http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 2465f0b..e3c5129 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.0-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %} + "version": "0.9.SPLITWIP-SNAPSHOT", {% comment %}BROOKLYN_VERSION{% endcomment %} "buildSha1": "c0fdc15291702281acdebf1b11d431a6385f5224", "buildBranch": "UNKNOWN" } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-docs/guide/misc/index.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/guide/misc/index.md b/brooklyn-docs/guide/misc/index.md index fab2222..3ecb4ac 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.0-SNAPSHOT Resources +title: Other 0.9.SPLITWIP-SNAPSHOT Resources layout: website-normal children: - { title: Javadoc, path: javadoc/ } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-docs/guide/ops/rest.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/guide/ops/rest.md b/brooklyn-docs/guide/ops/rest.md index c1d7b64..4c9712f 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.0-SNAPSHOT + http://localhost:8081/#v1/catalog/entities/cluster:0.9.SPLITWIP-SNAPSHOT And in the REST API it is accessed at: <!-- BROOKLYN_VERSION_BELOW --> - http://localhost:8081/v1/catalog/entities/cluster:0.9.0-SNAPSHOT + http://localhost:8081/v1/catalog/entities/cluster:0.9.SPLITWIP-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/3d793007/brooklyn-docs/index.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/index.md b/brooklyn-docs/index.md index 37015c5..1454c72 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.0-SNAPSHOT) <!-- BROOKLYN_VERSION --></a> +* <a href="{{ site.path.guide }}/">the brooklyn user guide (version 0.9.SPLITWIP-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/3d793007/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 886d3c7..9baa7af 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.0-SNAPSHOT +OLD_MASTER_VERSION=0.9.SPLITWIP-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/3d793007/brooklyn-docs/website/meta/versions.md ---------------------------------------------------------------------- diff --git a/brooklyn-docs/website/meta/versions.md b/brooklyn-docs/website/meta/versions.md index 4e704f4..2c0eaa5 100644 --- a/brooklyn-docs/website/meta/versions.md +++ b/brooklyn-docs/website/meta/versions.md @@ -41,11 +41,11 @@ This code has not been voted on and are not endorsed by The Apache Software Foun Documentation for these versions are uploaded from time to time, and are provided here for reference: -* **[0.9.0-SNAPSHOT](/v/0.9.0-SNAPSHOT/)**: latest unreleased version +* **[0.9.SPLITWIP-SNAPSHOT](/v/0.9.SPLITWIP-SNAPSHOT/)**: latest unreleased version (although docs may not be up-to-date with the latest code) * **[0.8.0-SNAPSHOT](/v/0.8.0-SNAPSHOT/)**: any changes since 0.8.0-incubating which would go into 0.8.1 -(mainly things from 0.9.0-SNAPSHOT which warranted being backported) +(mainly things from 0.9.SPLITWIP-SNAPSHOT which warranted being backported) * **[0.7.0-SNAPSHOT](/v/0.7.0-SNAPSHOT/)**: any changes since 0.7.0-incubating which would go into 0.7.1 (mainly things from 0.8.0-SNAPSHOT which warranted being backported) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 6add4bf..74bf3b4 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/examples/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/examples/pom.xml b/brooklyn-library/examples/pom.xml index 38703d1..5e97177 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 dcc7de7..f2b63e4 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 cd8f76f..26dba2b 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 afe9364..c50b3bc 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 19ff3ed..e08ff3f 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 559260e..15734d7 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/examples/webapps/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/examples/webapps/pom.xml b/brooklyn-library/examples/webapps/pom.xml index d5c0c05..242eb44 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/qa/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/qa/pom.xml b/brooklyn-library/qa/pom.xml index 35ba6ec..4b29355 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/qa/start-monitor.sh ---------------------------------------------------------------------- diff --git a/brooklyn-library/qa/start-monitor.sh b/brooklyn-library/qa/start-monitor.sh index 0fa8247..9568269 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.0-SNAPSHOT # BROOKLYN_VERSION +VERSION=0.9.SPLITWIP-SNAPSHOT # BROOKLYN_VERSION ROOT=$(cd $(dirname $0) && pwd) cd $ROOT http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/qa/start-webcluster.sh ---------------------------------------------------------------------- diff --git a/brooklyn-library/qa/start-webcluster.sh b/brooklyn-library/qa/start-webcluster.sh index 7aa678a..828e582 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.0-SNAPSHOT # BROOKLYN_VERSION +VERSION=0.9.SPLITWIP-SNAPSHOT # BROOKLYN_VERSION ROOT=$(cd $(dirname $0) && pwd) cd $ROOT http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 9439b60..e955940 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/sandbox/database/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/sandbox/database/pom.xml b/brooklyn-library/sandbox/database/pom.xml index b38a65d..e010c77 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/sandbox/extra/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/sandbox/extra/pom.xml b/brooklyn-library/sandbox/extra/pom.xml index 3fa5e8f..cd77f5e 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 25607e5..525cf4f 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/sandbox/monitoring/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/sandbox/monitoring/pom.xml b/brooklyn-library/sandbox/monitoring/pom.xml index 8a1caaf..d2d9cfa 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/sandbox/nosql/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/sandbox/nosql/pom.xml b/brooklyn-library/sandbox/nosql/pom.xml index 5b15536..e113427 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/software/database/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/database/pom.xml b/brooklyn-library/software/database/pom.xml index 890cbfb..a232640 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/software/messaging/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/messaging/pom.xml b/brooklyn-library/software/messaging/pom.xml index 38a6ff5..7955868 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/software/monitoring/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/monitoring/pom.xml b/brooklyn-library/software/monitoring/pom.xml index a626c18..64b3bed 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/software/network/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/network/pom.xml b/brooklyn-library/software/network/pom.xml index d6c7fd4..9682d2a 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/software/nosql/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/nosql/pom.xml b/brooklyn-library/software/nosql/pom.xml index 32dbeb6..5309182 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/software/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/osgi/pom.xml b/brooklyn-library/software/osgi/pom.xml index 6d6b141..7d98fb8 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-library/software/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-library/software/webapp/pom.xml b/brooklyn-library/software/webapp/pom.xml index 77c327c..1832f7b 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-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/api/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/api/pom.xml b/brooklyn-server/api/pom.xml index f1994f4..9e5b2e0 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 063f665..c9410f5 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 6fb8476..b4519cb 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.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 502c83e..a41c30a 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/camp/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/pom.xml b/brooklyn-server/camp/pom.xml index 59f3325..1f6b60e 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/core/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/core/pom.xml b/brooklyn-server/core/pom.xml index 240cc82..e40aec4 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 3e0a1a7..e2f4b9d 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.0-SNAPSHOT"; // BROOKLYN_VERSION + private final static String VERSION_FROM_STATIC = "0.9.SPLITWIP-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/3d793007/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 524e248..db0a29a 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.0-SNAPSHOT"); // BROOKLYN_VERSION + MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.9.SPLITWIP-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.0-SNAPSHOT"))); // BROOKLYN_VERSION + helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.9.SPLITWIP-SNAPSHOT"))); // BROOKLYN_VERSION } public void helperDuplicateBundle(String url) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 6882157..3a1123f 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/karaf/commands/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/karaf/commands/pom.xml b/brooklyn-server/karaf/commands/pom.xml index 0f138b4..975b66c9 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/karaf/features/pom.xml b/brooklyn-server/karaf/features/pom.xml index 03cd932..f5d06d8 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <artifactId>brooklyn-features</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/karaf/features/src/main/history/dependencies.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/karaf/features/src/main/history/dependencies.xml b/brooklyn-server/karaf/features/src/main/history/dependencies.xml index 8d705b5..a24aa5b 100644 --- a/brooklyn-server/karaf/features/src/main/history/dependencies.xml +++ b/brooklyn-server/karaf/features/src/main/history/dependencies.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"; name="org.apache.brooklyn-0.9.0-SNAPSHOT"> +<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"; name="org.apache.brooklyn-0.9.SPLITWIP-SNAPSHOT"> <feature version="0.0.0"> <feature prerequisite="false" dependency="false">brooklyn-api</feature> <feature prerequisite="false" dependency="false">brooklyn-api</feature> @@ -57,21 +57,21 @@ <bundle>mvn:net.minidev/asm/1.0.2</bundle> <bundle>mvn:net.minidev/json-smart/2.1.1</bundle> <bundle>mvn:net.schmizz/sshj/0.8.1</bundle> - <bundle>mvn:org.apache.brooklyn.camp/camp-base/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn.camp/camp-server/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-api/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-camp/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-commands/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-core/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-jsgui/0.9.0-SNAPSHOT/war</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-rest-api/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-rest-server/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-rt-osgi/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-utils-groovy/0.9.0-SNAPSHOT</bundle> - <bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/0.9.0-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn.camp/camp-base/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn.camp/camp-server/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-api/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-camp/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-commands/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-core/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-jsgui/0.9.SPLITWIP-SNAPSHOT/war</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-rest-api/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-rest-server/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-rt-osgi/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-utils-groovy/0.9.SPLITWIP-SNAPSHOT</bundle> + <bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/0.9.SPLITWIP-SNAPSHOT</bundle> <bundle>mvn:org.apache.commons/commons-compress/1.4</bundle> <bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle> <bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/karaf/itest/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/karaf/itest/pom.xml b/brooklyn-server/karaf/itest/pom.xml index 0b016a3..49e5869 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/karaf/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/karaf/pom.xml b/brooklyn-server/karaf/pom.xml index ac5006a..ea14e91 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</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/launcher/pom.xml b/brooklyn-server/launcher/pom.xml index b5045e7..25c1248 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/locations/jclouds/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/jclouds/pom.xml b/brooklyn-server/locations/jclouds/pom.xml index 3338893..efe1284 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 dad78b5..7bc1768 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 0861ee5..c58e72d 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/parent/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/parent/pom.xml b/brooklyn-server/parent/pom.xml index 7613897..c8e75d6 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</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <artifactId>brooklyn-parent</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/policy/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/policy/pom.xml b/brooklyn-server/policy/pom.xml index c28e39f..ffb0048 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 81306e5..312c4c7 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.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 389ffdd..30fa5ea 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 7583dd4..76e6f30 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.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/server-cli/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/server-cli/pom.xml b/brooklyn-server/server-cli/pom.xml index 92e925d..6d94808 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 483f04d..85a695a 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.0-SNAPSHOT # BROOKLYN_VERSION + version: 0.9.SPLITWIP-SNAPSHOT # BROOKLYN_VERSION items: # load everything in the classpath with a @Catalog annotation http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/software/base/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/software/base/pom.xml b/brooklyn-server/software/base/pom.xml index 556e982..89dbcaa 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 55c2e27..3861bae 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.0-SNAPSHOT"); // BROOKLYN_VERSION + public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "0.9.SPLITWIP-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/3d793007/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 8058d0f..860996c 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.0-SNAPSHOT/brooklynnode-0.8.0-snapshot.tar.gz + // file://$HOME/.brooklyn/repository/BrooklynNode/0.9.SPLITWIP-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/3d793007/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 40321ef..ea5f3ac 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.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script) + final static String BROOKLYN_VERSION = "0.9.SPLITWIP-SNAPSHOT"; // BROOKLYN_VERSION (updated by script) private final JmxSupport jmxSupport; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/software/winrm/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/software/winrm/pom.xml b/brooklyn-server/software/winrm/pom.xml index 5bde35e..fa1c801 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/storage/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/storage/hazelcast/pom.xml b/brooklyn-server/storage/hazelcast/pom.xml index 2b3befe..4db2945 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/test-framework/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/test-framework/pom.xml b/brooklyn-server/test-framework/pom.xml index b4297a9..cd27389 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.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/test-support/pom.xml b/brooklyn-server/test-support/pom.xml index 4d241d0..fb16b90 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-server/utils/common/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/common/pom.xml b/brooklyn-server/utils/common/pom.xml index 037dcd9..29723b2 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 654eebd..dcfb0e9 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.0-SNAPSHOT"; // BROOKLYN_VERSION + final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:0.9.SPLITWIP-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"; @@ -210,7 +210,7 @@ public class MavenArtifactTest { /* Exception java.lang.AssertionError - Message: Could not load /home/ubuntu/.m2/repository/org/apache/brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT/brooklyn-utils-common-0.9.0-SNAPSHOT.jar when testing MavenRetriever: do a maven build with no integration tests first to ensure this is installed, then rerun + Message: Could not load /home/ubuntu/.m2/repository/org/apache/brooklyn/brooklyn-utils-common/0.9.SPLITWIP-SNAPSHOT/brooklyn-utils-common-0.9.SPLITWIP-SNAPSHOT.jar when testing MavenRetriever: do a maven build with no integration tests first to ensure this is installed, then rerun Stacktrace: @@ -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.0-SNAPSHOT"); // BROOKLYN_VERSION + "org.apache.brooklyn:brooklyn-utils-common:jar:0.9.SPLITWIP-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/3d793007/brooklyn-server/utils/groovy/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/groovy/pom.xml b/brooklyn-server/utils/groovy/pom.xml index f25e30f..3f0b6a4 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 930f0a3..d16e59b 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 c11f417..1d7c43a 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 6f9a86f..2ba4810 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 147e1de..c33ec74 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 2cac7f0..8b75609 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 42fd5ab..611ffeb 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.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 2bf4ff6..3f185fd 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.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 ae70461..cd0f2a1 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.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 c8ecbd1..e22bc9e 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.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 8aacbe1..d4cc610 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.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/brooklyn-ui/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-ui/pom.xml b/brooklyn-ui/pom.xml index c9631c6..037472c 100644 --- a/brooklyn-ui/pom.xml +++ b/brooklyn-ui/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.9.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.9.SPLITWIP-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 c8e5c8a..e413e06 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.0-SNAPSHOT.</p> <!-- BROOKLYN_VERSION --> + <p>You are currently using Brooklyn Version 0.9.SPLITWIP-SNAPSHOT.</p> <!-- BROOKLYN_VERSION --> <hr/> Some useful references include: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d793007/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 a7c8121..d53ebd8 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.0-SNAPSHOT"><!-- Logo added via CSS --></a> <!-- BROOKLYN_VERSION --> + <a class="logo" href="#" title="Brooklyn, Version 0.9.SPLITWIP-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>
