You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/11/06 15:19:22 UTC
git commit: Set version to 0.7.0-M2-incubating
Repository: incubator-brooklyn
Updated Branches:
refs/heads/0.7.0-M2-incubating [created] 657fe0c57
Set version to 0.7.0-M2-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/657fe0c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/657fe0c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/657fe0c5
Branch: refs/heads/0.7.0-M2-incubating
Commit: 657fe0c578dcd059732586c9246925854ad342fc
Parents: 496052c
Author: Richard Downer <ri...@apache.org>
Authored: Thu Nov 6 14:16:49 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Nov 6 14:16:49 2014 +0000
----------------------------------------------------------------------
api/pom.xml | 2 +-
camp/camp-base/pom.xml | 2 +-
camp/camp-server/pom.xml | 2 +-
camp/pom.xml | 2 +-
core/pom.xml | 2 +-
.../src/main/java/brooklyn/BrooklynVersion.java | 2 +-
.../src/test/dependencies/osgi/entities/pom.xml | 2 +-
.../dependencies/osgi/more-entities-v1/pom.xml | 2 +-
.../dependencies/osgi/more-entities-v2/pom.xml | 2 +-
.../management/osgi/OsgiStandaloneTest.java | 4 ++--
docs/_config.yml | 4 ++--
docs/dev/build/developers-catalog.xml | 22 ++++++++++----------
docs/start/walkthrough/index.md | 4 ++--
.../use/guide/defining-applications/examples.md | 2 +-
docs/use/guide/quickstart/catalog.xml | 4 ++--
examples/global-web-fabric/pom.xml | 2 +-
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 +-
examples/webapps/pom.xml | 2 +-
locations/jclouds/pom.xml | 2 +-
policy/pom.xml | 2 +-
pom.xml | 4 ++--
sandbox/cassandra-multicloud-snitch/pom.xml | 2 +-
sandbox/database/pom.xml | 2 +-
.../examples/simple-open-loop-policy/pom.xml | 2 +-
sandbox/extra/pom.xml | 2 +-
sandbox/monitoring/pom.xml | 2 +-
sandbox/nosql/pom.xml | 2 +-
software/base/pom.xml | 2 +-
.../entity/brooklynnode/BrooklynNode.java | 2 +-
.../brooklyn/entity/java/JmxmpSslSupport.java | 2 +-
.../entity/brooklynnode/brooklyn-node.yaml | 2 +-
software/database/pom.xml | 2 +-
software/messaging/pom.xml | 2 +-
software/monitoring/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 +-
usage/all/pom.xml | 2 +-
usage/archetypes/quickstart/NOTES.txt | 4 ++--
usage/archetypes/quickstart/pom.xml | 2 +-
.../quickstart/src/brooklyn-sample/pom.xml | 2 +-
usage/camp/pom.xml | 2 +-
usage/cli/pom.xml | 2 +-
usage/dist/pom.xml | 2 +-
usage/dist/src/main/dist/conf/catalog.xml | 4 ++--
usage/downstream-parent/pom.xml | 4 ++--
usage/jsgui/pom.xml | 2 +-
.../src/main/webapp/assets/tpl/help/page.html | 2 +-
usage/jsgui/src/main/webapp/index.html | 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 +-
.../brooklyn/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 +-
73 files changed, 92 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 55c60b0..4ac93c0 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/camp/camp-base/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index 507831f..49290d7 100644
--- a/camp/camp-base/pom.xml
+++ b/camp/camp-base/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn.camp</groupId>
<artifactId>camp-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 6e6ee72..cdd1ef2 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn.camp</groupId>
<artifactId>camp-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/camp/pom.xml
----------------------------------------------------------------------
diff --git a/camp/pom.xml b/camp/pom.xml
index afd69eb..f870025 100644
--- a/camp/pom.xml
+++ b/camp/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 5145381..0e2b43b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/core/src/main/java/brooklyn/BrooklynVersion.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/BrooklynVersion.java b/core/src/main/java/brooklyn/BrooklynVersion.java
index 8ef6a61..3f6b35d 100644
--- a/core/src/main/java/brooklyn/BrooklynVersion.java
+++ b/core/src/main/java/brooklyn/BrooklynVersion.java
@@ -40,7 +40,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.7.0-SNAPSHOT"; // BROOKLYN_VERSION
+ private final String versionFromStatic = "0.7.0-M2-incubating"; // BROOKLYN_VERSION
private final String version;
public BrooklynVersion() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/core/src/test/dependencies/osgi/entities/pom.xml
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/entities/pom.xml b/core/src/test/dependencies/osgi/entities/pom.xml
index d143ea2..2eaa89f 100644
--- a/core/src/test/dependencies/osgi/entities/pom.xml
+++ b/core/src/test/dependencies/osgi/entities/pom.xml
@@ -35,7 +35,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/core/src/test/dependencies/osgi/more-entities-v1/pom.xml
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/more-entities-v1/pom.xml b/core/src/test/dependencies/osgi/more-entities-v1/pom.xml
index aab4774..18eb12f 100644
--- a/core/src/test/dependencies/osgi/more-entities-v1/pom.xml
+++ b/core/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.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/core/src/test/dependencies/osgi/more-entities-v2/pom.xml
----------------------------------------------------------------------
diff --git a/core/src/test/dependencies/osgi/more-entities-v2/pom.xml b/core/src/test/dependencies/osgi/more-entities-v2/pom.xml
index a29247d..270b764 100644
--- a/core/src/test/dependencies/osgi/more-entities-v2/pom.xml
+++ b/core/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.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java b/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
index 94b9e9e..9947fad 100644
--- a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
+++ b/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java
@@ -113,7 +113,7 @@ public class OsgiStandaloneTest {
@Test
public void testDuplicateBundle() throws Exception {
- MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.7.0-SNAPSHOT"); // BROOKLYN_VERSION
+ MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.7.0-M2-incubating"); // BROOKLYN_VERSION
String localUrl = MavenRetriever.localUrl(artifact);
if ("file".equals(Urls.getProtocol(localUrl))) {
helperDuplicateBundle(localUrl);
@@ -124,7 +124,7 @@ public class OsgiStandaloneTest {
@Test(groups="Integration")
public void testRemoteDuplicateBundle() throws Exception {
- helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.7.0-SNAPSHOT"))); // BROOKLYN_VERSION
+ helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.7.0-M2-incubating"))); // BROOKLYN_VERSION
}
public void helperDuplicateBundle(String url) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index 102de3e..0c778b4 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -17,7 +17,7 @@
# under the License.
#
markdown: rdiscount
-brooklyn-version: 0.7.0-SNAPSHOT # BROOKLYN_VERSION
+brooklyn-version: 0.7.0-M2-incubating # BROOKLYN_VERSION
brooklyn-snapshot-git-branch: master # if line above is SNAPSHOT this should point to corresponding git branch (e.g. master, 0.4)
brooklyn-root-url: /
-url: /v/0.7.0-SNAPSHOT # BROOKLYN_VERSION
+url: /v/0.7.0-M2-incubating # BROOKLYN_VERSION
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/docs/dev/build/developers-catalog.xml
----------------------------------------------------------------------
diff --git a/docs/dev/build/developers-catalog.xml b/docs/dev/build/developers-catalog.xml
index f190024..3afe052 100644
--- a/docs/dev/build/developers-catalog.xml
+++ b/docs/dev/build/developers-catalog.xml
@@ -70,17 +70,17 @@
<classpath>
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-web-cluster/0.7.0-SNAPSHOT/brooklyn-example-simple-web-cluster-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-global-web-fabric/0.7.0-SNAPSHOT/brooklyn-example-global-web-fabric-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-global-web-fabric/0.7.0-SNAPSHOT/brooklyn-example-global-web-fabric-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-portable-cloudfoundry/0.7.0-SNAPSHOT/brooklyn-example-portable-cloudfoundry-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-web-cluster/0.7.0-SNAPSHOT/brooklyn-example-simple-web-cluster-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.7.0-SNAPSHOT/brooklyn-example-hello-world-sql-webapp-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-messaging-pubsub/0.7.0-SNAPSHOT/brooklyn-example-simple-messaging-pubsub-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-examples-parent/0.7.0-SNAPSHOT/brooklyn-examples-parent-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-webapp/0.7.0-SNAPSHOT/brooklyn-example-hello-world-webapp-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-nosql-cluster/0.7.0-SNAPSHOT/brooklyn-example-simple-nosql-cluster-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-examples-webapps-parent/0.7.0-SNAPSHOT/brooklyn-examples-webapps-parent-0.7.0-SNAPSHOT.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-web-cluster/0.7.0-M2-incubating/brooklyn-example-simple-web-cluster-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-global-web-fabric/0.7.0-M2-incubating/brooklyn-example-global-web-fabric-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-global-web-fabric/0.7.0-M2-incubating/brooklyn-example-global-web-fabric-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-portable-cloudfoundry/0.7.0-M2-incubating/brooklyn-example-portable-cloudfoundry-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-web-cluster/0.7.0-M2-incubating/brooklyn-example-simple-web-cluster-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.7.0-M2-incubating/brooklyn-example-hello-world-sql-webapp-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-messaging-pubsub/0.7.0-M2-incubating/brooklyn-example-simple-messaging-pubsub-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-examples-parent/0.7.0-M2-incubating/brooklyn-examples-parent-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-hello-world-webapp/0.7.0-M2-incubating/brooklyn-example-hello-world-webapp-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-example-simple-nosql-cluster/0.7.0-M2-incubating/brooklyn-example-simple-nosql-cluster-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>file://~/.m2/repository/io/brooklyn/example/brooklyn-examples-webapps-parent/0.7.0-M2-incubating/brooklyn-examples-webapps-parent-0.7.0-M2-incubating.jar</entry> <!-- BROOKLYN_VERSION -->
</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/docs/start/walkthrough/index.md
----------------------------------------------------------------------
diff --git a/docs/start/walkthrough/index.md b/docs/start/walkthrough/index.md
index 13113e1..97c39af 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.7.0-SNAPSHOT
+$ export BROOKLYN_VERSION=0.7.0-M2-incubating
$ mvn archetype:generate \
-DarchetypeGroupId=io.brooklyn \
-DarchetypeArtifactId=brooklyn-archetype-quickstart \
@@ -49,7 +49,7 @@ This can be omitted for release versions, or if you already have a local `mvn in
{% else %}
{% highlight bash %}
-$ export BROOKLYN_VERSION=0.7.0-SNAPSHOT
+$ export BROOKLYN_VERSION=0.7.0-M2-incubating
$ mvn archetype:generate \
-DarchetypeGroupId=io.brooklyn \
-DarchetypeArtifactId=brooklyn-archetype-quickstart \
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/docs/use/guide/defining-applications/examples.md
----------------------------------------------------------------------
diff --git a/docs/use/guide/defining-applications/examples.md b/docs/use/guide/defining-applications/examples.md
index 47f96c1..b61f119 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
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-all</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/docs/use/guide/quickstart/catalog.xml
----------------------------------------------------------------------
diff --git a/docs/use/guide/quickstart/catalog.xml b/docs/use/guide/quickstart/catalog.xml
index cbb5584..7a4199e 100644
--- a/docs/use/guide/quickstart/catalog.xml
+++ b/docs/use/guide/quickstart/catalog.xml
@@ -14,8 +14,8 @@
</template>
<classpath>
- <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.7.0-M2-incubating&e=jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>https://oss.sonatype.org/service/local/artifact/maven/redirect?r=releases&g=io.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.7.0-M2-incubating&e=jar</entry> <!-- BROOKLYN_VERSION -->
</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/examples/global-web-fabric/pom.xml
----------------------------------------------------------------------
diff --git a/examples/global-web-fabric/pom.xml b/examples/global-web-fabric/pom.xml
index 16c90d9..d9347a9 100644
--- a/examples/global-web-fabric/pom.xml
+++ b/examples/global-web-fabric/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.brooklyn.example</groupId>
<artifactId>brooklyn-examples-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 1e85e96..93c0846 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/examples/simple-messaging-pubsub/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/pom.xml b/examples/simple-messaging-pubsub/pom.xml
index 520094c..2094e45 100644
--- a/examples/simple-messaging-pubsub/pom.xml
+++ b/examples/simple-messaging-pubsub/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.brooklyn.example</groupId>
<artifactId>brooklyn-examples-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/examples/simple-nosql-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/pom.xml b/examples/simple-nosql-cluster/pom.xml
index 7f00ec5..f03daa5 100644
--- a/examples/simple-nosql-cluster/pom.xml
+++ b/examples/simple-nosql-cluster/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.brooklyn.example</groupId>
<artifactId>brooklyn-examples-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/examples/simple-web-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/pom.xml b/examples/simple-web-cluster/pom.xml
index e484edd..1f78e2c 100644
--- a/examples/simple-web-cluster/pom.xml
+++ b/examples/simple-web-cluster/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.brooklyn.example</groupId>
<artifactId>brooklyn-examples-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/examples/webapps/hello-world-sql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-sql/pom.xml b/examples/webapps/hello-world-sql/pom.xml
index cc610a8..1ab9585 100644
--- a/examples/webapps/hello-world-sql/pom.xml
+++ b/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.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/examples/webapps/hello-world-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-webapp/pom.xml b/examples/webapps/hello-world-webapp/pom.xml
index c2ea589..d9d4782 100644
--- a/examples/webapps/hello-world-webapp/pom.xml
+++ b/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.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/examples/webapps/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/pom.xml b/examples/webapps/pom.xml
index 36537d6..ecc8bc3 100644
--- a/examples/webapps/pom.xml
+++ b/examples/webapps/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn.example</groupId>
<artifactId>brooklyn-examples-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/locations/jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index f86147b..8611d27 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/policy/pom.xml
----------------------------------------------------------------------
diff --git a/policy/pom.xml b/policy/pom.xml
index c90c370..ea928d8 100644
--- a/policy/pom.xml
+++ b/policy/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f40ed09..4207dbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<name>Brooklyn Parent Project</name>
<description>
@@ -121,7 +121,7 @@
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
<!-- Dependencies -->
- <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
+ <brooklyn.version>0.7.0-M2-incubating</brooklyn.version> <!-- BROOKLYN_VERSION -->
<jclouds.groupId>org.apache.jclouds</jclouds.groupId>
<jclouds.version>1.8.0</jclouds.version>
<guava.version>17.0</guava.version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/sandbox/cassandra-multicloud-snitch/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/cassandra-multicloud-snitch/pom.xml b/sandbox/cassandra-multicloud-snitch/pom.xml
index b876c2e..2f0cdc5 100644
--- a/sandbox/cassandra-multicloud-snitch/pom.xml
+++ b/sandbox/cassandra-multicloud-snitch/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/sandbox/database/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/database/pom.xml b/sandbox/database/pom.xml
index 9c82d2d..f57bbd6 100644
--- a/sandbox/database/pom.xml
+++ b/sandbox/database/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/sandbox/examples/simple-open-loop-policy/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/examples/simple-open-loop-policy/pom.xml b/sandbox/examples/simple-open-loop-policy/pom.xml
index bbeaa2a..d673e68 100644
--- a/sandbox/examples/simple-open-loop-policy/pom.xml
+++ b/sandbox/examples/simple-open-loop-policy/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn.example</groupId>
<artifactId>brooklyn-examples-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/sandbox/extra/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/extra/pom.xml b/sandbox/extra/pom.xml
index 28c8d91..47b0b79 100644
--- a/sandbox/extra/pom.xml
+++ b/sandbox/extra/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/sandbox/monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/pom.xml b/sandbox/monitoring/pom.xml
index a503ea6..6169b81 100644
--- a/sandbox/monitoring/pom.xml
+++ b/sandbox/monitoring/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/sandbox/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/nosql/pom.xml b/sandbox/nosql/pom.xml
index 679406f..888d364 100644
--- a/sandbox/nosql/pom.xml
+++ b/sandbox/nosql/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/base/pom.xml
----------------------------------------------------------------------
diff --git a/software/base/pom.xml b/software/base/pom.xml
index 443b8cd..39fb71c 100644
--- a/software/base/pom.xml
+++ b/software/base/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
----------------------------------------------------------------------
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 20626f9..561ebf7 100644
--- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
+++ b/software/base/src/main/java/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.7.0-SNAPSHOT"); // BROOKLYN_VERSION
+ public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "0.7.0-M2-incubating"); // BROOKLYN_VERSION
// Takes precedence over downloadUrl, if non-null
@SetFromFlag("distroUploadUrl")
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java
----------------------------------------------------------------------
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 b652abb..39e269b 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java
@@ -37,7 +37,7 @@ import com.google.common.base.Preconditions;
public class JmxmpSslSupport {
- final static String BROOKLYN_VERSION = "0.7.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script)
+ final static String BROOKLYN_VERSION = "0.7.0-M2-incubating"; // BROOKLYN_VERSION (updated by script)
private final JmxSupport jmxSupport;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml
----------------------------------------------------------------------
diff --git a/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml b/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml
index 55d09f6..ec901de 100644
--- a/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml
+++ b/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml
@@ -23,7 +23,7 @@ services:
- type: brooklyn.entity.brooklynnode.BrooklynNode
## to use a local file, specify something such as the following: [BROOKLYN_VERSION_BELOW]
- # downloadUrl: file:///tmp/brooklyn-dist-0.7.0-SNAPSHOT-dist.tar.gz
+ # downloadUrl: file:///tmp/brooklyn-dist-0.7.0-M2-incubating-dist.tar.gz
## if deploying to anything other than localhost you must also configure login details, e.g.:
# managementUsername: admin
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/database/pom.xml
----------------------------------------------------------------------
diff --git a/software/database/pom.xml b/software/database/pom.xml
index 7eec3cd..4c5b9c4e 100644
--- a/software/database/pom.xml
+++ b/software/database/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index 6f661d3..de95f5d 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/software/monitoring/pom.xml b/software/monitoring/pom.xml
index f239bc7..98d7acf 100644
--- a/software/monitoring/pom.xml
+++ b/software/monitoring/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/network/pom.xml
----------------------------------------------------------------------
diff --git a/software/network/pom.xml b/software/network/pom.xml
index 80ffb4b..d8957eb 100644
--- a/software/network/pom.xml
+++ b/software/network/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index fdb7bc1..58aa2d7 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml
index d13efb4..47b05fb 100644
--- a/software/osgi/pom.xml
+++ b/software/osgi/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/software/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml
index ccb89a2..95d397f 100644
--- a/software/webapp/pom.xml
+++ b/software/webapp/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/storage/hazelcast/pom.xml
----------------------------------------------------------------------
diff --git a/storage/hazelcast/pom.xml b/storage/hazelcast/pom.xml
index 9fa47b9..c7c9379 100644
--- a/storage/hazelcast/pom.xml
+++ b/storage/hazelcast/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/all/pom.xml
----------------------------------------------------------------------
diff --git a/usage/all/pom.xml b/usage/all/pom.xml
index 846c803..0243a39 100644
--- a/usage/all/pom.xml
+++ b/usage/all/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/archetypes/quickstart/NOTES.txt
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/NOTES.txt b/usage/archetypes/quickstart/NOTES.txt
index 40d8395..61d360a 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.7.0-SNAPSHOT # BROOKLYN_VERSION
+ export BV=0.7.0-M2-incubating # BROOKLYN_VERSION
mvn archetype:generate \
\
@@ -73,4 +73,4 @@ software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
-under the License.
\ No newline at end of file
+under the License.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index c69dd88..222620d 100644
--- a/usage/archetypes/quickstart/pom.xml
+++ b/usage/archetypes/quickstart/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
index 8dc348a..760aaa7 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -54,7 +54,7 @@
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
<!-- Dependencies -->
- <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
+ <brooklyn.version>0.7.0-M2-incubating</brooklyn.version> <!-- BROOKLYN_VERSION -->
<logback.version>1.0.7</logback.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index 96db968..9fbc42c 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version><!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/cli/pom.xml
----------------------------------------------------------------------
diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml
index a3a5262..88a1edf 100644
--- a/usage/cli/pom.xml
+++ b/usage/cli/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index 3b7f1e6..9c2b673 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/dist/src/main/dist/conf/catalog.xml
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/dist/conf/catalog.xml b/usage/dist/src/main/dist/conf/catalog.xml
index 343e1da..6f39cc2 100644
--- a/usage/dist/src/main/dist/conf/catalog.xml
+++ b/usage/dist/src/main/dist/conf/catalog.xml
@@ -30,8 +30,8 @@
</template>
<classpath>
- <entry>https://repository.apache.org/service/local/artifact/maven/redirect?r=releases&g=org.apache.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
- <entry>https://repository.apache.org/service/local/artifact/maven/redirect?r=releases&g=org.apache.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.7.0-SNAPSHOT&e=jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>https://repository.apache.org/service/local/artifact/maven/redirect?r=releases&g=org.apache.brooklyn.example&a=brooklyn-example-simple-web-cluster&v=0.7.0-M2-incubating&e=jar</entry> <!-- BROOKLYN_VERSION -->
+ <entry>https://repository.apache.org/service/local/artifact/maven/redirect?r=releases&g=org.apache.brooklyn.example&a=brooklyn-example-global-web-fabric&v=0.7.0-M2-incubating&e=jar</entry> <!-- BROOKLYN_VERSION -->
</classpath>
</catalog>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 251f5b2..e3da635 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-downstream-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<packaging>pom</packaging>
<name>Brooklyn Downstream Project Parent</name>
@@ -44,7 +44,7 @@
<excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups>
<!-- Dependencies -->
- <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
+ <brooklyn.version>0.7.0-M2-incubating</brooklyn.version> <!-- BROOKLYN_VERSION -->
<!-- versions should match those used by Brooklyn, to avoid conflicts -->
<jclouds.version>1.8.0</jclouds.version>
<logback.version>1.0.7</logback.version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 20e760e..9dbb270 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version><!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/jsgui/src/main/webapp/assets/tpl/help/page.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/help/page.html b/usage/jsgui/src/main/webapp/assets/tpl/help/page.html
index 7d3ef0a..7184eb9 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/help/page.html
+++ b/usage/jsgui/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.7.0-SNAPSHOT.</p> <!-- BROOKLYN_VERSION -->
+ <p>You are currently using Brooklyn Version 0.7.0-M2-incubating.</p> <!-- BROOKLYN_VERSION -->
<hr/>
Some useful references include:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/jsgui/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/index.html b/usage/jsgui/src/main/webapp/index.html
index b1436b3..a511fea 100644
--- a/usage/jsgui/src/main/webapp/index.html
+++ b/usage/jsgui/src/main/webapp/index.html
@@ -46,7 +46,7 @@ under the License.
<div class="navbar-inner">
<div class="userName-top"><span id="user"></span> | <a href="/logout">Log out</a></div>
<div class="container">
- <a class="logo" href="#" title="Brooklyn, Version 0.7.0-SNAPSHOT"><!-- Logo added via CSS --></a> <!-- BROOKLYN_VERSION -->
+ <a class="logo" href="#" title="Brooklyn, Version 0.7.0-M2-incubating"><!-- Logo added via CSS --></a> <!-- BROOKLYN_VERSION -->
<div class="menubar-top">
<ul class="nav">
<li><a href="#v1/home" class="nav1 nav1_home">Home</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index d105375..06315a9 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/logback-includes/pom.xml
----------------------------------------------------------------------
diff --git a/usage/logback-includes/pom.xml b/usage/logback-includes/pom.xml
index 2eed503..c39a8c7 100644
--- a/usage/logback-includes/pom.xml
+++ b/usage/logback-includes/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/logback-xml/pom.xml
----------------------------------------------------------------------
diff --git a/usage/logback-xml/pom.xml b/usage/logback-xml/pom.xml
index 9f84d1f..45abf2a 100644
--- a/usage/logback-xml/pom.xml
+++ b/usage/logback-xml/pom.xml
@@ -38,7 +38,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/qa/pom.xml
----------------------------------------------------------------------
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index e236eed..b69c8b0 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/qa/start-monitor.sh
----------------------------------------------------------------------
diff --git a/usage/qa/start-monitor.sh b/usage/qa/start-monitor.sh
index 6461dae..cc3d385 100755
--- a/usage/qa/start-monitor.sh
+++ b/usage/qa/start-monitor.sh
@@ -25,7 +25,7 @@
#set -x # debug
CLASS=brooklyn.qa.longevity.Monitor
-VERSION=0.7.0-SNAPSHOT # BROOKLYN_VERSION
+VERSION=0.7.0-M2-incubating # BROOKLYN_VERSION
ROOT=$(cd $(dirname $0) && pwd)
cd $ROOT
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/qa/start-webcluster.sh
----------------------------------------------------------------------
diff --git a/usage/qa/start-webcluster.sh b/usage/qa/start-webcluster.sh
index 497f6b3..d1cb218 100755
--- a/usage/qa/start-webcluster.sh
+++ b/usage/qa/start-webcluster.sh
@@ -25,7 +25,7 @@
#set -x # debug
CLASS=brooklyn.qa.longevity.webcluster.WebClusterApp
-VERSION=0.7.0-SNAPSHOT # BROOKLYN_VERSION
+VERSION=0.7.0-M2-incubating # BROOKLYN_VERSION
ROOT=$(cd $(dirname $0) && pwd)
cd $ROOT
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml
index c817d53..26c79ea 100644
--- a/usage/rest-api/pom.xml
+++ b/usage/rest-api/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version><!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml
index f39903c..8762832 100644
--- a/usage/rest-client/pom.xml
+++ b/usage/rest-client/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/rest-server/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml
index ae09981..4dba75a 100644
--- a/usage/rest-server/pom.xml
+++ b/usage/rest-server/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version><!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/usage/test-support/pom.xml
----------------------------------------------------------------------
diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml
index 9f15b7d..1eea842 100644
--- a/usage/test-support/pom.xml
+++ b/usage/test-support/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/utils/common/pom.xml
----------------------------------------------------------------------
diff --git a/utils/common/pom.xml b/utils/common/pom.xml
index 746658e..256a9ed 100644
--- a/utils/common/pom.xml
+++ b/utils/common/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
----------------------------------------------------------------------
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 7087041..1e2a31f 100644
--- a/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
+++ b/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
@@ -39,7 +39,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.3.2";
- final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:0.7.0-SNAPSHOT"; // BROOKLYN_VERSION
+ final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:0.7.0-M2-incubating"; // 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";
@@ -166,7 +166,7 @@ public class MavenArtifactTest {
@Test(groups="Integration")
public void testRetrievalHostedSnapshotIntegration() throws Exception {
MavenArtifact m = MavenArtifact.fromCoordinate(
- "org.apache.brooklyn:brooklyn-utils-common:jar:0.7.0-SNAPSHOT"); // BROOKLYN_VERSION
+ "org.apache.brooklyn:brooklyn-utils-common:jar:0.7.0-M2-incubating"); // BROOKLYN_VERSION
String localPath = new MavenRetriever().getLocalPath(m);
File f = new File(localPath);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/utils/groovy/pom.xml
----------------------------------------------------------------------
diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml
index 2542077..019c855 100644
--- a/utils/groovy/pom.xml
+++ b/utils/groovy/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/utils/jmx/jmxmp-ssl-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml
index 4a43c4e..3b6f84b 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/utils/jmx/jmxrmi-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml
index 11ed05d..6e4c7a8 100644
--- a/utils/jmx/jmxrmi-agent/pom.xml
+++ b/utils/jmx/jmxrmi-agent/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index fbe902d..58d7e16 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/657fe0c5/utils/test-support/pom.xml
----------------------------------------------------------------------
diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml
index c57f5fb..5d36699 100644
--- a/utils/test-support/pom.xml
+++ b/utils/test-support/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.7.0-M2-incubating</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>