From f49000fae3d78932ad9e85875e42f1f4af51da7e Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Mon, 18 Nov 2013 15:30:59 +0000 Subject: [PATCH] Changed version to 0.6.0 --- api/pom.xml | 2 +- core/pom.xml | 2 +- .../main/java/brooklyn/BrooklynVersion.java | 2 +- docs/_config.yml | 4 +-- docs/_scripts/help.txt | 2 +- docs/dev/build/developers-catalog.xml | 30 +++++++++---------- docs/start/walkthrough/index.md | 4 +-- .../guide/defining-applications/examples.md | 2 +- docs/use/guide/quickstart/catalog.xml | 4 +-- examples/global-web-fabric/pom.xml | 2 +- examples/hadoop-and-whirr/pom.xml | 2 +- examples/pom.xml | 2 +- examples/simple-messaging-pubsub/pom.xml | 2 +- examples/simple-nosql-cluster/pom.xml | 2 +- examples/simple-open-loop-policy/pom.xml | 2 +- examples/simple-web-cluster/pom.xml | 2 +- .../webapps/hello-world-hadoop-jar/pom.xml | 2 +- examples/webapps/hello-world-hadoop/pom.xml | 2 +- examples/webapps/hello-world-sql/pom.xml | 2 +- examples/webapps/hello-world-webapp/pom.xml | 2 +- examples/webapps/pom.xml | 2 +- locations/jclouds/pom.xml | 2 +- policy/pom.xml | 2 +- pom.xml | 4 +-- sandbox/camp/pom.xml | 2 +- sandbox/cassandra-multicloud-snitch/pom.xml | 2 +- sandbox/database/pom.xml | 2 +- sandbox/dropwizard/pom.xml | 2 +- sandbox/mgmt/pom.xml | 2 +- sandbox/monitoring/pom.xml | 2 +- sandbox/nosql/pom.xml | 2 +- sandbox/web-acceptance/pom.xml | 2 +- software/base/pom.xml | 2 +- .../entity/brooklynnode/BrooklynNode.java | 2 +- .../brooklyn/entity/java/JmxmpSslSupport.java | 2 +- software/database/pom.xml | 2 +- software/messaging/pom.xml | 2 +- software/network/pom.xml | 2 +- software/nosql/pom.xml | 2 +- software/osgi/pom.xml | 2 +- software/webapp/pom.xml | 2 +- storage/hazelcast/pom.xml | 2 +- systems/paas/openshift/pom.xml | 2 +- systems/whirr/base/pom.xml | 2 +- systems/whirr/hadoop/pom.xml | 2 +- usage/all/pom.xml | 2 +- usage/archetypes/quickstart/NOTES.txt | 2 +- usage/archetypes/quickstart/pom.xml | 2 +- .../quickstart/src/brooklyn-sample/pom.xml | 2 +- usage/cli/pom.xml | 2 +- usage/dist/pom.xml | 2 +- usage/dist/src/main/dist/conf/catalog.xml | 4 +-- usage/jsgui/pom.xml | 2 +- usage/launcher/pom.xml | 2 +- usage/logback-includes/pom.xml | 2 +- usage/logback-xml/pom.xml | 2 +- usage/qa/pom.xml | 2 +- usage/qa/start-monitor.sh | 2 +- usage/qa/start-webcluster.sh | 2 +- usage/rest-api/pom.xml | 2 +- usage/rest-client/pom.xml | 2 +- usage/rest-server/pom.xml | 2 +- usage/test-support/pom.xml | 2 +- utils/common/pom.xml | 2 +- .../util/maven/MavenArtifactTest.java | 4 +-- utils/groovy/pom.xml | 2 +- utils/jmx/jmxmp-ssl-agent/pom.xml | 2 +- utils/jmx/jmxrmi-agent/pom.xml | 2 +- utils/rest-swagger/pom.xml | 2 +- utils/test-support/pom.xml | 2 +- 70 files changed, 90 insertions(+), 90 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index aae6a225a1..56b989ec78 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -13,7 +13,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 9c69c9eb48..17987e74ad 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -12,7 +12,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/core/src/main/java/brooklyn/BrooklynVersion.java b/core/src/main/java/brooklyn/BrooklynVersion.java index 25b9c1fc44..8406411848 100644 --- a/core/src/main/java/brooklyn/BrooklynVersion.java +++ b/core/src/main/java/brooklyn/BrooklynVersion.java @@ -22,7 +22,7 @@ public class BrooklynVersion { private final String versionFromClasspath; // static useful when running from the IDE // TODO is the classpath version ever useful? should we always use the static? - private final String versionFromStatic = "0.6.0-SNAPSHOT"; // BROOKLYN_VERSION + private final String versionFromStatic = "0.6.0"; // BROOKLYN_VERSION private final String version; public BrooklynVersion() { diff --git a/docs/_config.yml b/docs/_config.yml index c9e849329a..bda7523d44 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,5 +1,5 @@ markdown: rdiscount -brooklyn-version: 0.6.0-SNAPSHOT # BROOKLYN_VERSION +brooklyn-version: 0.6.0 # BROOKLYN_VERSION brooklyn-snapshot-git-branch: master # if line above is SNAPSHOT this should point to corresponding git branch (e.g. master, 0.4) brooklyn-root-url: / -url: /v/0.6.0-SNAPSHOT # BROOKLYN_VERSION +url: /v/0.6.0 # BROOKLYN_VERSION diff --git a/docs/_scripts/help.txt b/docs/_scripts/help.txt index 35963b2dba..7ab9996606 100644 --- a/docs/_scripts/help.txt +++ b/docs/_scripts/help.txt @@ -30,7 +30,7 @@ updating a snapshot version, in /v/VERSION/ on the server: export TARGET=`pwd -P`/../../brooklyncentral.github.com -export BV=0.6.0-SNAPSHOT # BROOKLYN_VERSION +export BV=0.6.0 # BROOKLYN_VERSION # build, copy diff --git a/docs/dev/build/developers-catalog.xml b/docs/dev/build/developers-catalog.xml index 2a340d75da..3f11a0d43a 100644 --- a/docs/dev/build/developers-catalog.xml +++ b/docs/dev/build/developers-catalog.xml @@ -72,21 +72,21 @@ - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-web-cluster/0.6.0-SNAPSHOT/brooklyn-example-simple-web-cluster-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-global-web-fabric/0.6.0-SNAPSHOT/brooklyn-example-global-web-fabric-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-global-web-fabric/0.6.0-SNAPSHOT/brooklyn-example-global-web-fabric-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-hadoop-webapp/0.6.0-SNAPSHOT/brooklyn-example-hello-world-hadoop-webapp-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-portable-cloudfoundry/0.6.0-SNAPSHOT/brooklyn-example-portable-cloudfoundry-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-web-cluster/0.6.0-SNAPSHOT/brooklyn-example-simple-web-cluster-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hadoop-and-whirr/0.6.0-SNAPSHOT/brooklyn-example-hadoop-and-whirr-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0-SNAPSHOT/brooklyn-example-hello-world-sql-webapp-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-messaging-pubsub/0.6.0-SNAPSHOT/brooklyn-example-simple-messaging-pubsub-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-examples-parent/0.6.0-SNAPSHOT/brooklyn-examples-parent-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-hadoop-jar/0.6.0-SNAPSHOT/brooklyn-example-hello-world-hadoop-jar-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-webapp/0.6.0-SNAPSHOT/brooklyn-example-hello-world-webapp-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-nosql-cluster/0.6.0-SNAPSHOT/brooklyn-example-simple-nosql-cluster-0.6.0-SNAPSHOT.jar - file://~/.m2/repository/io/brooklyn/example/brooklyn-examples-webapps-parent/0.6.0-SNAPSHOT/brooklyn-examples-webapps-parent-0.6.0-SNAPSHOT.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-web-cluster/0.6.0/brooklyn-example-simple-web-cluster-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-global-web-fabric/0.6.0/brooklyn-example-global-web-fabric-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-global-web-fabric/0.6.0/brooklyn-example-global-web-fabric-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-hadoop-webapp/0.6.0/brooklyn-example-hello-world-hadoop-webapp-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-portable-cloudfoundry/0.6.0/brooklyn-example-portable-cloudfoundry-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-web-cluster/0.6.0/brooklyn-example-simple-web-cluster-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hadoop-and-whirr/0.6.0/brooklyn-example-hadoop-and-whirr-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-messaging-pubsub/0.6.0/brooklyn-example-simple-messaging-pubsub-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-examples-parent/0.6.0/brooklyn-examples-parent-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-hadoop-jar/0.6.0/brooklyn-example-hello-world-hadoop-jar-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-webapp/0.6.0/brooklyn-example-hello-world-webapp-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-nosql-cluster/0.6.0/brooklyn-example-simple-nosql-cluster-0.6.0.jar + file://~/.m2/repository/io/brooklyn/example/brooklyn-examples-webapps-parent/0.6.0/brooklyn-examples-webapps-parent-0.6.0.jar - \ No newline at end of file + diff --git a/docs/start/walkthrough/index.md b/docs/start/walkthrough/index.md index de85deed6f..d0457f4547 100644 --- a/docs/start/walkthrough/index.md +++ b/docs/start/walkthrough/index.md @@ -29,7 +29,7 @@ You can of course follow this walkthrough without installing it on your machine {% if SNAPSHOT %} {% highlight bash %} -$ export BROOKLYN_VERSION=0.6.0-SNAPSHOT +$ export BROOKLYN_VERSION=0.6.0 $ mvn archetype:generate \ -DarchetypeGroupId=io.brooklyn \ -DarchetypeArtifactId=brooklyn-archetype-quickstart \ @@ -48,7 +48,7 @@ This can be omitted for release versions, or if you already have a local `mvn in {% else %} {% highlight bash %} -$ export BROOKLYN_VERSION=0.6.0-SNAPSHOT +$ export BROOKLYN_VERSION=0.6.0 $ mvn archetype:generate \ -DarchetypeGroupId=io.brooklyn \ -DarchetypeArtifactId=brooklyn-archetype-quickstart \ diff --git a/docs/use/guide/defining-applications/examples.md b/docs/use/guide/defining-applications/examples.md index 1606565e5e..ba0f7d22f7 100644 --- a/docs/use/guide/defining-applications/examples.md +++ b/docs/use/guide/defining-applications/examples.md @@ -22,7 +22,7 @@ If you have a Maven-based project, integrate this XML fragment with your pom.xml io.brooklyn brooklyn-all - 0.6.0-SNAPSHOT + 0.6.0 diff --git a/docs/use/guide/quickstart/catalog.xml b/docs/use/guide/quickstart/catalog.xml index c40a743b53..e11b8bf94b 100644 --- a/docs/use/guide/quickstart/catalog.xml +++ b/docs/use/guide/quickstart/catalog.xml @@ -13,8 +13,8 @@ - https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.6.0-SNAPSHOT&e=jar - https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.6.0-SNAPSHOT&e=jar + https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.6.0&e=jar + https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.6.0&e=jar diff --git a/examples/global-web-fabric/pom.xml b/examples/global-web-fabric/pom.xml index 3657b2534c..297bc8dfcb 100644 --- a/examples/global-web-fabric/pom.xml +++ b/examples/global-web-fabric/pom.xml @@ -7,7 +7,7 @@ io.brooklyn.example brooklyn-examples-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/hadoop-and-whirr/pom.xml b/examples/hadoop-and-whirr/pom.xml index 0d041c920d..d80c1eb380 100644 --- a/examples/hadoop-and-whirr/pom.xml +++ b/examples/hadoop-and-whirr/pom.xml @@ -8,7 +8,7 @@ io.brooklyn.example brooklyn-examples-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index e8ff5d8138..14fdc2673f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -15,7 +15,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/simple-messaging-pubsub/pom.xml b/examples/simple-messaging-pubsub/pom.xml index 2a76ca7a0b..c0c509da6b 100644 --- a/examples/simple-messaging-pubsub/pom.xml +++ b/examples/simple-messaging-pubsub/pom.xml @@ -7,7 +7,7 @@ io.brooklyn.example brooklyn-examples-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/simple-nosql-cluster/pom.xml b/examples/simple-nosql-cluster/pom.xml index b54cb54926..ea8252e73e 100644 --- a/examples/simple-nosql-cluster/pom.xml +++ b/examples/simple-nosql-cluster/pom.xml @@ -12,7 +12,7 @@ io.brooklyn.example brooklyn-examples-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/simple-open-loop-policy/pom.xml b/examples/simple-open-loop-policy/pom.xml index 5774ab6345..490de07246 100644 --- a/examples/simple-open-loop-policy/pom.xml +++ b/examples/simple-open-loop-policy/pom.xml @@ -9,7 +9,7 @@ io.brooklyn.example brooklyn-examples-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/simple-web-cluster/pom.xml b/examples/simple-web-cluster/pom.xml index 546afcf03e..aef5bc0468 100644 --- a/examples/simple-web-cluster/pom.xml +++ b/examples/simple-web-cluster/pom.xml @@ -9,7 +9,7 @@ io.brooklyn.example brooklyn-examples-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/webapps/hello-world-hadoop-jar/pom.xml b/examples/webapps/hello-world-hadoop-jar/pom.xml index b44cb3a3f9..c190fb7345 100644 --- a/examples/webapps/hello-world-hadoop-jar/pom.xml +++ b/examples/webapps/hello-world-hadoop-jar/pom.xml @@ -20,7 +20,7 @@ io.brooklyn.example brooklyn-examples-webapps-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/webapps/hello-world-hadoop/pom.xml b/examples/webapps/hello-world-hadoop/pom.xml index c3f01a93a2..773327c6c3 100644 --- a/examples/webapps/hello-world-hadoop/pom.xml +++ b/examples/webapps/hello-world-hadoop/pom.xml @@ -7,7 +7,7 @@ io.brooklyn.example brooklyn-examples-webapps-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/webapps/hello-world-sql/pom.xml b/examples/webapps/hello-world-sql/pom.xml index 22c999f819..e0d2e66d1d 100644 --- a/examples/webapps/hello-world-sql/pom.xml +++ b/examples/webapps/hello-world-sql/pom.xml @@ -7,7 +7,7 @@ io.brooklyn.example brooklyn-examples-webapps-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/webapps/hello-world-webapp/pom.xml b/examples/webapps/hello-world-webapp/pom.xml index 0ef6498de9..61bc5da04c 100644 --- a/examples/webapps/hello-world-webapp/pom.xml +++ b/examples/webapps/hello-world-webapp/pom.xml @@ -7,7 +7,7 @@ io.brooklyn.example brooklyn-examples-webapps-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/examples/webapps/pom.xml b/examples/webapps/pom.xml index bfbdf523db..50f715a141 100644 --- a/examples/webapps/pom.xml +++ b/examples/webapps/pom.xml @@ -12,7 +12,7 @@ io.brooklyn.example brooklyn-examples-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml index 96ec30a69b..93d24f332e 100644 --- a/locations/jclouds/pom.xml +++ b/locations/jclouds/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/policy/pom.xml b/policy/pom.xml index eca8d4c044..e98230ab49 100644 --- a/policy/pom.xml +++ b/policy/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 8fa620f8df..ad4d0ebc87 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 Brooklyn Parent Project @@ -75,7 +75,7 @@ UTF-8 UTF-8 - 0.6.0-SNAPSHOT + 0.6.0 1.9.4.1 2.13 diff --git a/sandbox/camp/pom.xml b/sandbox/camp/pom.xml index 63add68f56..8851877d40 100644 --- a/sandbox/camp/pom.xml +++ b/sandbox/camp/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/sandbox/cassandra-multicloud-snitch/pom.xml b/sandbox/cassandra-multicloud-snitch/pom.xml index c7bc2d4442..2b0b9de05c 100644 --- a/sandbox/cassandra-multicloud-snitch/pom.xml +++ b/sandbox/cassandra-multicloud-snitch/pom.xml @@ -10,7 +10,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/sandbox/database/pom.xml b/sandbox/database/pom.xml index da4e85f304..213f8b0d6c 100644 --- a/sandbox/database/pom.xml +++ b/sandbox/database/pom.xml @@ -12,7 +12,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/sandbox/dropwizard/pom.xml b/sandbox/dropwizard/pom.xml index 037602aedd..d9dc92cdfa 100644 --- a/sandbox/dropwizard/pom.xml +++ b/sandbox/dropwizard/pom.xml @@ -13,7 +13,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/sandbox/mgmt/pom.xml b/sandbox/mgmt/pom.xml index 808b3341e8..d773a5785f 100644 --- a/sandbox/mgmt/pom.xml +++ b/sandbox/mgmt/pom.xml @@ -10,7 +10,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/sandbox/monitoring/pom.xml b/sandbox/monitoring/pom.xml index 6d5f9d2917..33a15d4711 100644 --- a/sandbox/monitoring/pom.xml +++ b/sandbox/monitoring/pom.xml @@ -12,7 +12,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/sandbox/nosql/pom.xml b/sandbox/nosql/pom.xml index b9289a882a..3c6572a622 100644 --- a/sandbox/nosql/pom.xml +++ b/sandbox/nosql/pom.xml @@ -13,7 +13,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/sandbox/web-acceptance/pom.xml b/sandbox/web-acceptance/pom.xml index 90dd3acedd..a362b0a21f 100644 --- a/sandbox/web-acceptance/pom.xml +++ b/sandbox/web-acceptance/pom.xml @@ -9,7 +9,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/software/base/pom.xml b/software/base/pom.xml index 4b6cb81b3c..15b62ea144 100644 --- a/software/base/pom.xml +++ b/software/base/pom.xml @@ -12,7 +12,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java index b41bcad969..c7270cb7a6 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java @@ -32,7 +32,7 @@ public interface BrooklynNode extends SoftwareProcess, UsesJava { Map.class, "brooklynnode.copytorundir", "URLs of resources to be copied across to the server, giving the path they are to be copied to", MutableMap.of()); @SetFromFlag("version") - public static final ConfigKey SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "0.6.0-SNAPSHOT"); // BROOKLYN_VERSION + public static final ConfigKey SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "0.6.0"); // BROOKLYN_VERSION // Takes presidence over downloadUrl, if non-null @SetFromFlag("distroUploadUrl") diff --git a/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java b/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java index 34f3721d19..3fa3e169de 100644 --- a/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java +++ b/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java @@ -19,7 +19,7 @@ public class JmxmpSslSupport { - final static String BROOKLYN_VERSION = "0.6.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script) + final static String BROOKLYN_VERSION = "0.6.0"; // BROOKLYN_VERSION (updated by script) private final JmxSupport jmxSupport; diff --git a/software/database/pom.xml b/software/database/pom.xml index dc2dfbd057..a3620020cb 100644 --- a/software/database/pom.xml +++ b/software/database/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml index 6ab03d19e3..d64ecee062 100644 --- a/software/messaging/pom.xml +++ b/software/messaging/pom.xml @@ -10,7 +10,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/software/network/pom.xml b/software/network/pom.xml index ac935e4936..0be7aa12d8 100644 --- a/software/network/pom.xml +++ b/software/network/pom.xml @@ -9,7 +9,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml index 2fbee153b1..3c0259344d 100644 --- a/software/nosql/pom.xml +++ b/software/nosql/pom.xml @@ -10,7 +10,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml index c6d4dd705f..c63e5e8235 100644 --- a/software/osgi/pom.xml +++ b/software/osgi/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml index 07f70adc48..2f5f69689f 100644 --- a/software/webapp/pom.xml +++ b/software/webapp/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/storage/hazelcast/pom.xml b/storage/hazelcast/pom.xml index 19a29eca59..92bbef841a 100644 --- a/storage/hazelcast/pom.xml +++ b/storage/hazelcast/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/systems/paas/openshift/pom.xml b/systems/paas/openshift/pom.xml index cd9ad7f12e..bd0d2ca788 100644 --- a/systems/paas/openshift/pom.xml +++ b/systems/paas/openshift/pom.xml @@ -10,7 +10,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../../pom.xml diff --git a/systems/whirr/base/pom.xml b/systems/whirr/base/pom.xml index 799fef1009..74a0932f8c 100644 --- a/systems/whirr/base/pom.xml +++ b/systems/whirr/base/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../../pom.xml diff --git a/systems/whirr/hadoop/pom.xml b/systems/whirr/hadoop/pom.xml index e25020d3ef..ea2018d5b8 100644 --- a/systems/whirr/hadoop/pom.xml +++ b/systems/whirr/hadoop/pom.xml @@ -10,7 +10,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../../pom.xml diff --git a/usage/all/pom.xml b/usage/all/pom.xml index d2773daf10..f845b473d9 100644 --- a/usage/all/pom.xml +++ b/usage/all/pom.xml @@ -14,7 +14,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/archetypes/quickstart/NOTES.txt b/usage/archetypes/quickstart/NOTES.txt index 1f4a03ffbb..a8eddbb03d 100644 --- a/usage/archetypes/quickstart/NOTES.txt +++ b/usage/archetypes/quickstart/NOTES.txt @@ -32,7 +32,7 @@ To test a build: pushd /tmp rm -rf brooklyn-sample - export BV=0.6.0-SNAPSHOT # BROOKLYN_VERSION + export BV=0.6.0 # BROOKLYN_VERSION mvn archetype:generate \ \ diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml index 80769b35f2..3a119cf010 100644 --- a/usage/archetypes/quickstart/pom.xml +++ b/usage/archetypes/quickstart/pom.xml @@ -13,7 +13,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../../pom.xml diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml index 5d69a50c77..bf6c45dc4f 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml +++ b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml @@ -42,7 +42,7 @@ UTF-8 UTF-8 - 0.6.0-SNAPSHOT + 0.6.0 1.0.7 6.3.1 2.13 diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml index bad835fc80..1f979e7036 100644 --- a/usage/cli/pom.xml +++ b/usage/cli/pom.xml @@ -13,7 +13,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml index e4754f983a..92eca2db2e 100644 --- a/usage/dist/pom.xml +++ b/usage/dist/pom.xml @@ -15,7 +15,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/dist/src/main/dist/conf/catalog.xml b/usage/dist/src/main/dist/conf/catalog.xml index e4fb8e63f2..367b159ffe 100644 --- a/usage/dist/src/main/dist/conf/catalog.xml +++ b/usage/dist/src/main/dist/conf/catalog.xml @@ -11,8 +11,8 @@ - https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.6.0-SNAPSHOT&e=jar - https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.6.0-SNAPSHOT&e=jar + https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.6.0&e=jar + https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.6.0&e=jar diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml index bec88a9d79..b44306f072 100644 --- a/usage/jsgui/pom.xml +++ b/usage/jsgui/pom.xml @@ -15,7 +15,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml index 206827cbed..b0cf6af298 100644 --- a/usage/launcher/pom.xml +++ b/usage/launcher/pom.xml @@ -14,7 +14,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/logback-includes/pom.xml b/usage/logback-includes/pom.xml index 1761019ff8..218ed81165 100644 --- a/usage/logback-includes/pom.xml +++ b/usage/logback-includes/pom.xml @@ -15,7 +15,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/logback-xml/pom.xml b/usage/logback-xml/pom.xml index ef8a66119e..7867746f7d 100644 --- a/usage/logback-xml/pom.xml +++ b/usage/logback-xml/pom.xml @@ -21,7 +21,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml index fd48a719fa..f5095a1cc7 100644 --- a/usage/qa/pom.xml +++ b/usage/qa/pom.xml @@ -10,7 +10,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/qa/start-monitor.sh b/usage/qa/start-monitor.sh index 4d578c5a03..ec975e53f5 100755 --- a/usage/qa/start-monitor.sh +++ b/usage/qa/start-monitor.sh @@ -7,7 +7,7 @@ #set -x # debug CLASS=brooklyn.qa.longevity.Monitor -VERSION=0.6.0-SNAPSHOT # BROOKLYN_VERSION +VERSION=0.6.0 # BROOKLYN_VERSION ROOT=$(cd $(dirname $0) && pwd) cd $ROOT diff --git a/usage/qa/start-webcluster.sh b/usage/qa/start-webcluster.sh index e623cff40f..8c6eabe760 100755 --- a/usage/qa/start-webcluster.sh +++ b/usage/qa/start-webcluster.sh @@ -7,7 +7,7 @@ #set -x # debug CLASS=brooklyn.qa.longevity.webcluster.WebClusterApp -VERSION=0.6.0-SNAPSHOT # BROOKLYN_VERSION +VERSION=0.6.0 # BROOKLYN_VERSION ROOT=$(cd $(dirname $0) && pwd) cd $ROOT diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml index 996c6a010e..a02d23e71e 100644 --- a/usage/rest-api/pom.xml +++ b/usage/rest-api/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml index 0dc382a8e0..fef2c52cf6 100644 --- a/usage/rest-client/pom.xml +++ b/usage/rest-client/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml index ddcd8e7f1a..43cbe786fd 100644 --- a/usage/rest-server/pom.xml +++ b/usage/rest-server/pom.xml @@ -11,7 +11,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml index cfc88b1752..5bab6c5d95 100644 --- a/usage/test-support/pom.xml +++ b/usage/test-support/pom.xml @@ -10,7 +10,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/utils/common/pom.xml b/utils/common/pom.xml index eb4c52bd7f..472729967e 100644 --- a/utils/common/pom.xml +++ b/utils/common/pom.xml @@ -13,7 +13,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java b/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java index 3c2ecc9ecc..9c2f7faf5e 100644 --- a/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java +++ b/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java @@ -21,7 +21,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.4"; - final static String THIS_PROJECT_COORDINATE = "io.brooklyn:brooklyn-utils-common:jar:0.6.0-SNAPSHOT"; // BROOKLYN_VERSION + final static String THIS_PROJECT_COORDINATE = "io.brooklyn:brooklyn-utils-common:jar:0.6.0"; // BROOKLYN_VERSION public void testArtifact() { MavenArtifact m = MavenArtifact.fromCoordinate(MAVEN_JAR_PLUGIN_COORDINATE); @@ -108,7 +108,7 @@ protected void checkValidMavenJarUrl(String url) { @Test(groups="Integration") public void testRetrievalHostedSnapshotIntegration() { MavenArtifact m = MavenArtifact.fromCoordinate( - "io.brooklyn:brooklyn-utils-common:jar:0.6.0-SNAPSHOT"); // BROOKLYN_VERSION + "io.brooklyn:brooklyn-utils-common:jar:0.6.0"); // BROOKLYN_VERSION String localPath = new MavenRetriever().getLocalPath(m); File f = new File(localPath); diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml index 8aaba233aa..165c72d277 100644 --- a/utils/groovy/pom.xml +++ b/utils/groovy/pom.xml @@ -13,7 +13,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml index b95074ac75..f5c853cb24 100644 --- a/utils/jmx/jmxmp-ssl-agent/pom.xml +++ b/utils/jmx/jmxmp-ssl-agent/pom.xml @@ -14,7 +14,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../../pom.xml diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml index e3695c7c69..d84fee8706 100644 --- a/utils/jmx/jmxrmi-agent/pom.xml +++ b/utils/jmx/jmxrmi-agent/pom.xml @@ -14,7 +14,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../../pom.xml diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml index c0be5dc5da..8b8aa5b6f4 100644 --- a/utils/rest-swagger/pom.xml +++ b/utils/rest-swagger/pom.xml @@ -13,7 +13,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml index 027ce52c06..af54e64571 100644 --- a/utils/test-support/pom.xml +++ b/utils/test-support/pom.xml @@ -13,7 +13,7 @@ io.brooklyn brooklyn-parent - 0.6.0-SNAPSHOT + 0.6.0 ../../pom.xml