Repository: brooklyn-server Updated Branches: refs/heads/master c56932034 -> 688567409
Bump version to 0.12.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/68856740 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/68856740 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/68856740 Branch: refs/heads/master Commit: 688567409670a6fc59f708abae113d3666f6fe0e Parents: c569320 Author: Richard Downer <[email protected]> Authored: Tue Apr 11 15:14:02 2017 +0000 Committer: Richard Downer <[email protected]> Committed: Tue Apr 11 15:14:02 2017 +0000 ---------------------------------------------------------------------- api/pom.xml | 2 +- camp/camp-base/pom.xml | 2 +- camp/camp-brooklyn/pom.xml | 2 +- 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 +- core/src/main/resources/catalog.bom | 2 +- .../org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java | 4 ++-- karaf/commands/pom.xml | 2 +- karaf/features/pom.xml | 2 +- karaf/httpcomponent-extension/pom.xml | 2 +- karaf/init/pom.xml | 2 +- karaf/init/src/main/resources/catalog-classes.bom | 2 +- karaf/itests/pom.xml | 2 +- karaf/jetty-config/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 +- policy/src/main/resources/catalog.bom | 2 +- pom.xml | 4 ++-- rest/rest-api/pom.xml | 2 +- rest/rest-resources/pom.xml | 2 +- rest/rest-server/pom.xml | 2 +- server-cli/pom.xml | 2 +- server-cli/src/main/resources/brooklyn/default.catalog.bom | 2 +- server-cli/src/main/resources/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/base/src/main/resources/catalog.bom | 2 +- software/winrm/pom.xml | 2 +- storage/hazelcast/pom.xml | 2 +- test-framework/pom.xml | 2 +- test-framework/src/main/resources/catalog.bom | 2 +- test-support/pom.xml | 2 +- utils/common/dependencies/osgi/com-example-entities/pom.xml | 2 +- .../osgi/com-example-entities/src/main/resources/catalog.bom | 2 +- utils/common/dependencies/osgi/entities/pom.xml | 2 +- .../dependencies/osgi/entities/src/main/resources/catalog.bom | 2 +- utils/common/dependencies/osgi/more-entities-v1/pom.xml | 2 +- .../osgi/more-entities-v1/src/main/resources/catalog.bom | 2 +- .../common/dependencies/osgi/more-entities-v2-evil-twin/pom.xml | 2 +- .../more-entities-v2-evil-twin/src/main/resources/catalog.bom | 2 +- utils/common/dependencies/osgi/more-entities-v2/pom.xml | 2 +- .../osgi/more-entities-v2/src/main/resources/catalog.bom | 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 +- 60 files changed, 63 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/api/pom.xml ---------------------------------------------------------------------- diff --git a/api/pom.xml b/api/pom.xml index 0891a44..f924522 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/camp/camp-base/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml index cb921bd..8790eb5 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/camp/camp-brooklyn/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/pom.xml b/camp/camp-brooklyn/pom.xml index 4ad2a94..0daa855 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.11.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/camp/camp-server/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml index 3500a43..60a0555 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/camp/pom.xml ---------------------------------------------------------------------- diff --git a/camp/pom.xml b/camp/pom.xml index 49a9d99..2fdcf45 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index ddb9bf8..58608a2 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/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 85364e3..fc9556d 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.11.0-SNAPSHOT"; // BROOKLYN_VERSION + private final static String VERSION_FROM_STATIC = "0.12.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/68856740/core/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/core/src/main/resources/catalog.bom b/core/src/main/resources/catalog.bom index 6f19e62..a2fff9a 100644 --- a/core/src/main/resources/catalog.bom +++ b/core/src/main/resources/catalog.bom @@ -16,7 +16,7 @@ # under the License. brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION itemType: entity items: - id: org.apache.brooklyn.entity.group.QuarantineGroup http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/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 ebce8e6..35429f1 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 @@ -88,7 +88,7 @@ public class OsgiStandaloneTest extends OsgiTestBase { @Test public void testDuplicateBundle() throws Exception { - MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.11.0-SNAPSHOT"); // BROOKLYN_VERSION + MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.12.0-SNAPSHOT"); // BROOKLYN_VERSION String localUrl = MavenRetriever.localUrl(artifact); if ("file".equals(Urls.getProtocol(localUrl))) { helperDuplicateBundle(localUrl); @@ -99,7 +99,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.11.0-SNAPSHOT"))); // BROOKLYN_VERSION + helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.12.0-SNAPSHOT"))); // BROOKLYN_VERSION } public void helperDuplicateBundle(String url) throws Exception { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/karaf/commands/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/commands/pom.xml b/karaf/commands/pom.xml index 64b2e52..60b7c29 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml index f53c51d..185be98 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <artifactId>brooklyn-features</artifactId> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/karaf/httpcomponent-extension/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/httpcomponent-extension/pom.xml b/karaf/httpcomponent-extension/pom.xml index e82e8d5..d81d6b9 100644 --- a/karaf/httpcomponent-extension/pom.xml +++ b/karaf/httpcomponent-extension/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-karaf</artifactId> - <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/karaf/init/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/init/pom.xml b/karaf/init/pom.xml index 4d77752..a527784 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/karaf/init/src/main/resources/catalog-classes.bom ---------------------------------------------------------------------- diff --git a/karaf/init/src/main/resources/catalog-classes.bom b/karaf/init/src/main/resources/catalog-classes.bom index 1ce6840..be49e73 100644 --- a/karaf/init/src/main/resources/catalog-classes.bom +++ b/karaf/init/src/main/resources/catalog-classes.bom @@ -16,7 +16,7 @@ # under the License. # brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION items: # org.apache.brooklyn.core - itemType: entity http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/karaf/itests/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/itests/pom.xml b/karaf/itests/pom.xml index 410a169..4ae4f8c 100644 --- a/karaf/itests/pom.xml +++ b/karaf/itests/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-karaf</artifactId> - <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <artifactId>brooklyn-features-itests</artifactId> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/karaf/jetty-config/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/jetty-config/pom.xml b/karaf/jetty-config/pom.xml index 8009469..5579e0f 100644 --- a/karaf/jetty-config/pom.xml +++ b/karaf/jetty-config/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-karaf</artifactId> - <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/karaf/pom.xml ---------------------------------------------------------------------- diff --git a/karaf/pom.xml b/karaf/pom.xml index 727f032..8ef2e23 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/launcher-common/pom.xml ---------------------------------------------------------------------- diff --git a/launcher-common/pom.xml b/launcher-common/pom.xml index bc264b0..42710b8 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/launcher/pom.xml b/launcher/pom.xml index c7a6920..c7259fe 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/locations/jclouds/pom.xml ---------------------------------------------------------------------- diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml index fac54d7..b00ddc7 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/logging/logback-includes/pom.xml ---------------------------------------------------------------------- diff --git a/logging/logback-includes/pom.xml b/logging/logback-includes/pom.xml index 65a6a49..f67f012 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/logging/logback-xml/pom.xml ---------------------------------------------------------------------- diff --git a/logging/logback-xml/pom.xml b/logging/logback-xml/pom.xml index 8f403b2..6e1c0e9 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 7ebbf5f..f9a669c 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/policy/pom.xml ---------------------------------------------------------------------- diff --git a/policy/pom.xml b/policy/pom.xml index 7322521..7a2c2cf 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/policy/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/policy/src/main/resources/catalog.bom b/policy/src/main/resources/catalog.bom index c106016..d57ac8d 100644 --- a/policy/src/main/resources/catalog.bom +++ b/policy/src/main/resources/catalog.bom @@ -16,7 +16,7 @@ # under the License. brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION items: - id: org.apache.brooklyn.policy.ha.ConnectionFailureDetector itemType: policy http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7e17877..d2809f3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-server</artifactId> - <version>0.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>pom</packaging> <name>Brooklyn Server Root</name> @@ -83,7 +83,7 @@ </repositories> <properties> - <brooklyn.version>0.11.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <brooklyn.version>0.12.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/68856740/rest/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/rest/rest-api/pom.xml b/rest/rest-api/pom.xml index 179231d..fc75e5e 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.11.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/rest/rest-resources/pom.xml ---------------------------------------------------------------------- diff --git a/rest/rest-resources/pom.xml b/rest/rest-resources/pom.xml index 80c60c0..d14369e 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.11.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/rest/rest-server/pom.xml ---------------------------------------------------------------------- diff --git a/rest/rest-server/pom.xml b/rest/rest-server/pom.xml index a269b72..a76f9b2 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.11.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/server-cli/pom.xml ---------------------------------------------------------------------- diff --git a/server-cli/pom.xml b/server-cli/pom.xml index a207599..63eeef1 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/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 150242e..5a5d1b2 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.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.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/68856740/server-cli/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/server-cli/src/main/resources/catalog.bom b/server-cli/src/main/resources/catalog.bom index 7910b7c..b67ff52 100644 --- a/server-cli/src/main/resources/catalog.bom +++ b/server-cli/src/main/resources/catalog.bom @@ -3,7 +3,7 @@ # and templates to get started using Brooklyn brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.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/68856740/software/base/pom.xml ---------------------------------------------------------------------- diff --git a/software/base/pom.xml b/software/base/pom.xml index b04e795..1b1bc56 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/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 ba43afc..de251d4 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.11.0-SNAPSHOT"); // BROOKLYN_VERSION + public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "0.12.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/68856740/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 818cf77..c112488 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.11.0-SNAPSHOT/brooklynnode-0.8.0-snapshot.tar.gz + // file://$HOME/.brooklyn/repository/BrooklynNode/0.12.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/68856740/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 e12b1ff..d3ff6ef 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.11.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script) + final static String BROOKLYN_VERSION = "0.12.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script) private final JmxSupport jmxSupport; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/software/base/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/software/base/src/main/resources/catalog.bom b/software/base/src/main/resources/catalog.bom index c803f1e..7fafca9 100644 --- a/software/base/src/main/resources/catalog.bom +++ b/software/base/src/main/resources/catalog.bom @@ -16,7 +16,7 @@ # under the License. brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION itemType: entity items: - id: org.apache.brooklyn.entity.machine.MachineEntity http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/software/winrm/pom.xml ---------------------------------------------------------------------- diff --git a/software/winrm/pom.xml b/software/winrm/pom.xml index be4ac9f..760a331 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/storage/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/storage/hazelcast/pom.xml b/storage/hazelcast/pom.xml index 921535e..1017f3c 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/test-framework/pom.xml ---------------------------------------------------------------------- diff --git a/test-framework/pom.xml b/test-framework/pom.xml index bc778ea..5dab319 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.11.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.12.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/68856740/test-framework/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/test-framework/src/main/resources/catalog.bom b/test-framework/src/main/resources/catalog.bom index b3b85a9..bf4d18d 100644 --- a/test-framework/src/main/resources/catalog.bom +++ b/test-framework/src/main/resources/catalog.bom @@ -16,7 +16,7 @@ # under the License. brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION itemType: entity items: - id: org.apache.brooklyn.test.framework.TestSshCommand http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/test-support/pom.xml b/test-support/pom.xml index caf4949..a58233d 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/common/dependencies/osgi/com-example-entities/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/com-example-entities/pom.xml b/utils/common/dependencies/osgi/com-example-entities/pom.xml index 310f198..f737fa3 100644 --- a/utils/common/dependencies/osgi/com-example-entities/pom.xml +++ b/utils/common/dependencies/osgi/com-example-entities/pom.xml @@ -40,7 +40,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.11.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/common/dependencies/osgi/com-example-entities/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/com-example-entities/src/main/resources/catalog.bom b/utils/common/dependencies/osgi/com-example-entities/src/main/resources/catalog.bom index a767eff..a5fe6bd 100644 --- a/utils/common/dependencies/osgi/com-example-entities/src/main/resources/catalog.bom +++ b/utils/common/dependencies/osgi/com-example-entities/src/main/resources/catalog.bom @@ -17,7 +17,7 @@ brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION itemType: entity description: For testing loading catalog.bom with catalog scan displayName: I Haz Catalog http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/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 fb7ac85..2698b2e 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.11.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/common/dependencies/osgi/entities/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/entities/src/main/resources/catalog.bom b/utils/common/dependencies/osgi/entities/src/main/resources/catalog.bom index 4b9df71..e491a23 100644 --- a/utils/common/dependencies/osgi/entities/src/main/resources/catalog.bom +++ b/utils/common/dependencies/osgi/entities/src/main/resources/catalog.bom @@ -17,7 +17,7 @@ brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION itemType: entity description: For testing loading catalog.bom with catalog scan displayName: I Haz Catalog http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/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 979f649..efd0dd7 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.11.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/common/dependencies/osgi/more-entities-v1/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/more-entities-v1/src/main/resources/catalog.bom b/utils/common/dependencies/osgi/more-entities-v1/src/main/resources/catalog.bom index 412e546..c3e97dc 100644 --- a/utils/common/dependencies/osgi/more-entities-v1/src/main/resources/catalog.bom +++ b/utils/common/dependencies/osgi/more-entities-v1/src/main/resources/catalog.bom @@ -16,7 +16,7 @@ # under the License. brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION itemType: entity items: - id: org.apache.brooklyn.test.osgi.entities.more.MoreEntity http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/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 c3618bb..b09ca20 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.11.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/common/dependencies/osgi/more-entities-v2-evil-twin/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/more-entities-v2-evil-twin/src/main/resources/catalog.bom b/utils/common/dependencies/osgi/more-entities-v2-evil-twin/src/main/resources/catalog.bom index 412e546..c3e97dc 100644 --- a/utils/common/dependencies/osgi/more-entities-v2-evil-twin/src/main/resources/catalog.bom +++ b/utils/common/dependencies/osgi/more-entities-v2-evil-twin/src/main/resources/catalog.bom @@ -16,7 +16,7 @@ # under the License. brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION itemType: entity items: - id: org.apache.brooklyn.test.osgi.entities.more.MoreEntity http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/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 3637b26..9fef24d 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.11.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/common/dependencies/osgi/more-entities-v2/src/main/resources/catalog.bom ---------------------------------------------------------------------- diff --git a/utils/common/dependencies/osgi/more-entities-v2/src/main/resources/catalog.bom b/utils/common/dependencies/osgi/more-entities-v2/src/main/resources/catalog.bom index 6431f6c..3ae38e5 100644 --- a/utils/common/dependencies/osgi/more-entities-v2/src/main/resources/catalog.bom +++ b/utils/common/dependencies/osgi/more-entities-v2/src/main/resources/catalog.bom @@ -16,7 +16,7 @@ # under the License. brooklyn.catalog: - version: "0.11.0-SNAPSHOT" # BROOKLYN_VERSION + version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION items: - id: org.apache.brooklyn.test.osgi.entities.more.MorePolicy itemType: policy http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/common/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/pom.xml b/utils/common/pom.xml index 16126cf..c35ba0f 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/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 07d51b4..81abebd 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.11.0-SNAPSHOT"; // BROOKLYN_VERSION + final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:0.12.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.11.0-SNAPSHOT"); // BROOKLYN_VERSION + "org.apache.brooklyn:brooklyn-utils-common:jar:0.12.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/68856740/utils/groovy/pom.xml ---------------------------------------------------------------------- diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml index afda51e..43d1798 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/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 47a4d97..7d034f2 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/jmx/jmxrmi-agent/pom.xml ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml index 8690497..93410cf 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/rest-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml index d836f2c..3afcc49 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/rt-felix/pom.xml ---------------------------------------------------------------------- diff --git a/utils/rt-felix/pom.xml b/utils/rt-felix/pom.xml index 0190bdb..c1ddedd 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/68856740/utils/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml index 8b4f41c..778eacc 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.11.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.12.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent>
