Repository: brooklyn-server Updated Branches: refs/heads/master 89f9dd7a3 -> cf305e25c
Change version to 0.10.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/cf305e25 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/cf305e25 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/cf305e25 Branch: refs/heads/master Commit: cf305e25c5680946e711b6b92dca5193a87d00f5 Parents: 89f9dd7 Author: Alex Heneveld <[email protected]> Authored: Wed Mar 30 10:59:23 2016 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Mar 30 10:59:23 2016 +0100 ---------------------------------------------------------------------- api/pom.xml | 2 +- camp/camp-base/pom.xml | 2 +- camp/camp-brooklyn/pom.xml | 2 +- camp/camp-server-jersey/pom.xml | 4 ++-- camp/camp-server/pom.xml | 2 +- camp/pom.xml | 2 +- core/pom.xml | 2 +- core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java | 2 +- .../org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java | 4 ++-- karaf/apache-brooklyn/pom.xml | 2 +- karaf/commands/pom.xml | 2 +- karaf/features/pom.xml | 2 +- karaf/init/pom.xml | 2 +- karaf/itest/pom.xml | 2 +- karaf/pom.xml | 2 +- launcher-common/pom.xml | 2 +- launcher/pom.xml | 2 +- locations/jclouds/pom.xml | 2 +- logging/logback-includes/pom.xml | 2 +- logging/logback-xml/pom.xml | 2 +- parent/pom.xml | 2 +- policy/pom.xml | 2 +- pom.xml | 4 ++-- rest/rest-api/pom.xml | 2 +- rest/rest-client/pom.xml | 2 +- rest/rest-resources/pom.xml | 2 +- rest/rest-server-jersey/pom.xml | 2 +- rest/rest-server/pom.xml | 2 +- server-cli/pom.xml | 2 +- server-cli/src/main/resources/brooklyn/default.catalog.bom | 2 +- software/base/pom.xml | 2 +- .../org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java | 2 +- .../brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java | 2 +- .../java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java | 2 +- software/winrm/pom.xml | 2 +- storage/hazelcast/pom.xml | 2 +- test-framework/pom.xml | 2 +- test-support/pom.xml | 2 +- utils/common/dependencies/osgi/entities/pom.xml | 2 +- utils/common/dependencies/osgi/more-entities-v1/pom.xml | 2 +- .../common/dependencies/osgi/more-entities-v2-evil-twin/pom.xml | 2 +- utils/common/dependencies/osgi/more-entities-v2/pom.xml | 2 +- utils/common/pom.xml | 2 +- .../java/org/apache/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/rt-felix/pom.xml | 2 +- utils/test-support/pom.xml | 2 +- 50 files changed, 54 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/api/pom.xml ---------------------------------------------------------------------- diff --git a/api/pom.xml b/api/pom.xml index f1994f4..46a8420 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/camp/camp-base/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml index 063f665..7e24a63 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/camp/camp-brooklyn/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/pom.xml b/camp/camp-brooklyn/pom.xml index 4ffeb44..5e2f3bf 100644 --- a/camp/camp-brooklyn/pom.xml +++ b/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.10.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/camp/camp-server-jersey/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-server-jersey/pom.xml b/camp/camp-server-jersey/pom.xml index 5bb2517..8854b7b 100644 --- a/camp/camp-server-jersey/pom.xml +++ b/camp/camp-server-jersey/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn.camp</groupId> <artifactId>camp-parent</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> @@ -222,4 +222,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/camp/camp-server/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml index 642474b..1db75e3 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/camp/pom.xml ---------------------------------------------------------------------- diff --git a/camp/pom.xml b/camp/pom.xml index 3bbce4b..441d0dd 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 4603ad5..ef3e850 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java index 12d6889..c7debf4 100644 --- a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java +++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java @@ -79,7 +79,7 @@ public class BrooklynVersion implements BrooklynVersionService { // 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.10.0-SNAPSHOT"; // BROOKLYN_VERSION private static final AtomicReference<Boolean> IS_DEV_ENV = new AtomicReference<Boolean>(); private static final String BROOKLYN_FEATURE_PREFIX = "Brooklyn-Feature-"; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java index 524e248..6c375f6 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java +++ b/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.10.0-SNAPSHOT"); // BROOKLYN_VERSION String localUrl = MavenRetriever.localUrl(artifact); if ("file".equals(Urls.getProtocol(localUrl))) { helperDuplicateBundle(localUrl); @@ -98,7 +98,7 @@ public class OsgiStandaloneTest extends OsgiTestBase { @Test(groups="Integration") public void testRemoteDuplicateBundle() throws Exception { - helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.9.0-SNAPSHOT"))); // BROOKLYN_VERSION + helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.10.0-SNAPSHOT"))); // BROOKLYN_VERSION } public void helperDuplicateBundle(String url) throws Exception { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/karaf/apache-brooklyn/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml index 1d01a4a..ee43acc 100755 --- a/karaf/apache-brooklyn/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/karaf/commands/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/commands/pom.xml b/karaf/commands/pom.xml index 7918d2e..ed930b7 100644 --- a/karaf/commands/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml index c7bb6b4..986c93c 100755 --- a/karaf/features/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <artifactId>brooklyn-features</artifactId> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/karaf/init/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/init/pom.xml b/karaf/init/pom.xml index 6f2ac86..18b4058 100644 --- a/karaf/init/pom.xml +++ b/karaf/init/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/karaf/itest/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml index a09503b..20b8065 100644 --- a/karaf/itest/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/karaf/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/pom.xml b/karaf/pom.xml index af154a5..6ef1ff4 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -28,7 +28,7 @@ <groupId>org.apache.brooklyn</groupId> <!-- if this depends on brooklyn-server/parent, the usual parent point, then karaf-itest has failures --> <artifactId>brooklyn-server</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/launcher-common/pom.xml ---------------------------------------------------------------------- diff --git a/launcher-common/pom.xml b/launcher-common/pom.xml index e1c20a4..7b4821c 100644 --- a/launcher-common/pom.xml +++ b/launcher-common/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/launcher/pom.xml b/launcher/pom.xml index e7c188a..b5a3575 100644 --- a/launcher/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/locations/jclouds/pom.xml ---------------------------------------------------------------------- diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml index 2fcf96f..9bf5021 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/logging/logback-includes/pom.xml ---------------------------------------------------------------------- diff --git a/logging/logback-includes/pom.xml b/logging/logback-includes/pom.xml index dad78b5..18759c4 100644 --- a/logging/logback-includes/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/logging/logback-xml/pom.xml ---------------------------------------------------------------------- diff --git a/logging/logback-xml/pom.xml b/logging/logback-xml/pom.xml index 0861ee5..9ef9b32 100644 --- a/logging/logback-xml/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 06d10db..c945c62 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-server</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/policy/pom.xml ---------------------------------------------------------------------- diff --git a/policy/pom.xml b/policy/pom.xml index c28e39f..62717fe 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d6d0e7a..588675c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-server</artifactId> - <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>pom</packaging> <name>Brooklyn Server Root</name> @@ -73,7 +73,7 @@ </mailingLists> <properties> - <brooklyn.version>0.9.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <brooklyn.version>0.10.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> <org.osgi.core.version>6.0.0</org.osgi.core.version> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/rest/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/rest/rest-api/pom.xml b/rest/rest-api/pom.xml index 9265015..e30214e 100644 --- a/rest/rest-api/pom.xml +++ b/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.10.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/rest/rest-client/pom.xml ---------------------------------------------------------------------- diff --git a/rest/rest-client/pom.xml b/rest/rest-client/pom.xml index afb9d65..1828f8f 100644 --- a/rest/rest-client/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/rest/rest-resources/pom.xml ---------------------------------------------------------------------- diff --git a/rest/rest-resources/pom.xml b/rest/rest-resources/pom.xml index 83533e6..3c25f3d 100644 --- a/rest/rest-resources/pom.xml +++ b/rest/rest-resources/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.10.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/rest/rest-server-jersey/pom.xml ---------------------------------------------------------------------- diff --git a/rest/rest-server-jersey/pom.xml b/rest/rest-server-jersey/pom.xml index a102681..5c78ff0 100644 --- a/rest/rest-server-jersey/pom.xml +++ b/rest/rest-server-jersey/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.10.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/rest/rest-server/pom.xml ---------------------------------------------------------------------- diff --git a/rest/rest-server/pom.xml b/rest/rest-server/pom.xml index 94d4895..51923d1 100644 --- a/rest/rest-server/pom.xml +++ b/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.10.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/server-cli/pom.xml ---------------------------------------------------------------------- diff --git a/server-cli/pom.xml b/server-cli/pom.xml index 3e4c6ea..7fa60bc 100644 --- a/server-cli/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/server-cli/src/main/resources/brooklyn/default.catalog.bom ---------------------------------------------------------------------- diff --git a/server-cli/src/main/resources/brooklyn/default.catalog.bom b/server-cli/src/main/resources/brooklyn/default.catalog.bom index 97dc8a7..c5feceb 100644 --- a/server-cli/src/main/resources/brooklyn/default.catalog.bom +++ b/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.10.0-SNAPSHOT # BROOKLYN_VERSION items: # load everything in the classpath with a @Catalog annotation http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/software/base/pom.xml ---------------------------------------------------------------------- diff --git a/software/base/pom.xml b/software/base/pom.xml index b9c72ee..04306fc 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java index aae5455..626c4e5 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java +++ b/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.10.0-SNAPSHOT"); // BROOKLYN_VERSION @SetFromFlag("distroUploadUrl") public static final ConfigKey<String> DISTRO_UPLOAD_URL = ConfigKeys.newStringConfigKey( http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java index bdcad9d..2d1d870 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java @@ -130,7 +130,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.10.0-SNAPSHOT/brooklynnode-0.8.0-snapshot.tar.gz // (DOWNLOAD_URL overrides this and has a default which comes from maven) List<String> urls = resolver.getTargets(); String saveAs = resolver.getFilename(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java index 40321ef..408eeb5 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java +++ b/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.10.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script) private final JmxSupport jmxSupport; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/software/winrm/pom.xml ---------------------------------------------------------------------- diff --git a/software/winrm/pom.xml b/software/winrm/pom.xml index b94e94d..dd0ee5c 100644 --- a/software/winrm/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/storage/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/storage/hazelcast/pom.xml b/storage/hazelcast/pom.xml index d9dee5c..81219e8 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/test-framework/pom.xml ---------------------------------------------------------------------- diff --git a/test-framework/pom.xml b/test-framework/pom.xml index 1d334a6..66e626a 100644 --- a/test-framework/pom.xml +++ b/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.10.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/test-support/pom.xml b/test-support/pom.xml index 4397900..84beaf6 100644 --- a/test-support/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/common/dependencies/osgi/entities/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/entities/pom.xml b/utils/common/dependencies/osgi/entities/pom.xml index d391f34..4792666 100644 --- a/utils/common/dependencies/osgi/entities/pom.xml +++ b/utils/common/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.10.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/common/dependencies/osgi/more-entities-v1/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/more-entities-v1/pom.xml b/utils/common/dependencies/osgi/more-entities-v1/pom.xml index 000c5cd..262baa0 100644 --- a/utils/common/dependencies/osgi/more-entities-v1/pom.xml +++ b/utils/common/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.10.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/common/dependencies/osgi/more-entities-v2-evil-twin/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/more-entities-v2-evil-twin/pom.xml b/utils/common/dependencies/osgi/more-entities-v2-evil-twin/pom.xml index 9ad32fe..dce8733 100644 --- a/utils/common/dependencies/osgi/more-entities-v2-evil-twin/pom.xml +++ b/utils/common/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.10.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/common/dependencies/osgi/more-entities-v2/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/more-entities-v2/pom.xml b/utils/common/dependencies/osgi/more-entities-v2/pom.xml index 4b4a4fb..405229e 100644 --- a/utils/common/dependencies/osgi/more-entities-v2/pom.xml +++ b/utils/common/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.10.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/common/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/pom.xml b/utils/common/pom.xml index e8b1892..32c47ed 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java ---------------------------------------------------------------------- diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java index a713bb3..d96f29b 100644 --- a/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java +++ b/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.10.0-SNAPSHOT"; // BROOKLYN_VERSION // Don't need to be installed, only used as examples final static String RELEASED_SOURCES_COORDINATE = "io.brooklyn:brooklyn-core:jar:sources:0.6.0"; @@ -248,7 +248,7 @@ public class MavenArtifactTest { @Test(groups={"Integration","Broken"}) public void testRetrievalHostedSnapshotIntegration() throws Exception { MavenArtifact m = MavenArtifact.fromCoordinate( - "org.apache.brooklyn:brooklyn-utils-common:jar:0.9.0-SNAPSHOT"); // BROOKLYN_VERSION + "org.apache.brooklyn:brooklyn-utils-common:jar:0.10.0-SNAPSHOT"); // BROOKLYN_VERSION String localPath = new MavenRetriever().getLocalPath(m); File f = new File(localPath); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/groovy/pom.xml ---------------------------------------------------------------------- diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml index f25e30f..44cf06f 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/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 123e6f4..b9da9f0 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/jmx/jmxrmi-agent/pom.xml ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml index c11f417..3ba210d 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/rest-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml index 3afa7e0..86b94d9 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.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/rt-felix/pom.xml ---------------------------------------------------------------------- diff --git a/utils/rt-felix/pom.xml b/utils/rt-felix/pom.xml index 5d1ff69..61ef3e4 100644 --- a/utils/rt-felix/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cf305e25/utils/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml index 8aacbe1..600cf34 100644 --- a/utils/test-support/pom.xml +++ b/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.10.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent>
