Change version to 1.2.0-SNAPSHOT
diff --git a/api/pom.xml b/api/pom.xml
index b0c7952..e9a5a36 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index 5620159..172fec5 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/camp/camp-brooklyn/pom.xml b/camp/camp-brooklyn/pom.xml
index 26e529e..5e09be5 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>1.1.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index db1f56c..4c13a40 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/camp/pom.xml b/camp/pom.xml
index 62189f1..4552b47 100644
--- a/camp/pom.xml
+++ b/camp/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/core/pom.xml b/core/pom.xml
index a0979a6..12dcd7d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
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 5aa64f2..26cca48 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
@@ -85,7 +85,7 @@
// may be useful:
// private static final String OSGI_BRANCH_PROPERTY_NAME = "Implementation-Branch";
- private final static String VERSION_FROM_STATIC = "1.1.0-SNAPSHOT"; // BROOKLYN_VERSION
+ private final static String VERSION_FROM_STATIC = "1.2.0-SNAPSHOT"; // BROOKLYN_VERSION
private static final AtomicReference<Boolean> IS_DEV_ENV = new AtomicReference<Boolean>();
private static final String BROOKLYN_FEATURE_PREFIX = "Brooklyn-Feature-";
diff --git a/core/src/main/resources/catalog.bom b/core/src/main/resources/catalog.bom
index a1cb2d7..3ae192c 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: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION
items:
- itemType: entity
items:
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 6cde61c..9817f87 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
@@ -70,7 +70,7 @@
@Test
public void testDuplicateBundle() throws Exception {
- MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "1.1.0-SNAPSHOT"); // BROOKLYN_VERSION
+ MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "1.2.0-SNAPSHOT"); // BROOKLYN_VERSION
String localUrl = MavenRetriever.localUrl(artifact);
if ("file".equals(Urls.getProtocol(localUrl))) {
helperDuplicateBundle(localUrl);
@@ -81,7 +81,7 @@
@Test(groups="Integration")
public void testRemoteDuplicateBundle() throws Exception {
- helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "1.1.0-SNAPSHOT"))); // BROOKLYN_VERSION
+ helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "1.2.0-SNAPSHOT"))); // BROOKLYN_VERSION
}
public void helperDuplicateBundle(String url) throws Exception {
diff --git a/core/src/test/resources/catalog.bom b/core/src/test/resources/catalog.bom
index 66a0a69..a081f4a 100644
--- a/core/src/test/resources/catalog.bom
+++ b/core/src/test/resources/catalog.bom
@@ -17,4 +17,4 @@
brooklyn.catalog:
bundle: org.apache.brooklyn.core-tests
- version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION
diff --git a/karaf/commands/pom.xml b/karaf/commands/pom.xml
index d10cd8f..458dfa6 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index 9b4e901..a0284a1 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
</parent>
<artifactId>brooklyn-features</artifactId>
diff --git a/karaf/httpcomponent-extension/pom.xml b/karaf/httpcomponent-extension/pom.xml
index 30a6962..a5d932f 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/karaf/init/pom.xml b/karaf/init/pom.xml
index 23b1736..b86d04d 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/karaf/init/src/main/resources/catalog.bom b/karaf/init/src/main/resources/catalog.bom
index 5993ec6..ba10136 100644
--- a/karaf/init/src/main/resources/catalog.bom
+++ b/karaf/init/src/main/resources/catalog.bom
@@ -16,7 +16,7 @@
# under the License.
#
brooklyn.catalog:
- version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION
items:
# provides aliases for the most common items
diff --git a/karaf/jetty-config/pom.xml b/karaf/jetty-config/pom.xml
index 36e2764..a52d871 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index cfaad5e..acd1e95 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/karaf/start/pom.xml b/karaf/start/pom.xml
index a41b9ef..41cc40f 100644
--- a/karaf/start/pom.xml
+++ b/karaf/start/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/launcher-common/pom.xml b/launcher-common/pom.xml
index 3dd4806..00bba43 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/launcher/pom.xml b/launcher/pom.xml
index d68c9bc..fdad11e 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index 6bf2ada..2a65e3c 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/locations/container/src/test/resources/generic-application.tests.bom b/locations/container/src/test/resources/generic-application.tests.bom
index 292e2d2..6c3dd38 100644
--- a/locations/container/src/test/resources/generic-application.tests.bom
+++ b/locations/container/src/test/resources/generic-application.tests.bom
@@ -47,7 +47,7 @@
##
brooklyn.catalog:
- version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION
iconUrl: https://raw.githubusercontent.com/docker-library/docs/471fa6e4cb58062ccbf91afc111980f9c7004981/swarm/logo.png
items:
diff --git a/locations/container/src/test/resources/generic.tests.bom b/locations/container/src/test/resources/generic.tests.bom
index 7d469ce..e212132 100644
--- a/locations/container/src/test/resources/generic.tests.bom
+++ b/locations/container/src/test/resources/generic.tests.bom
@@ -16,7 +16,7 @@
# under the License.
brooklyn.catalog:
- version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION
iconUrl: https://raw.githubusercontent.com/docker-library/docs/471fa6e4cb58062ccbf91afc111980f9c7004981/swarm/logo.png
items:
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index c2c7398..031f602 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/logging/logback-includes/pom.xml b/logging/logback-includes/pom.xml
index 965e24b..9522be8 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/logging/logback-xml/pom.xml b/logging/logback-xml/pom.xml
index 90cddd6..188787e 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/parent/pom.xml b/parent/pom.xml
index a6b1a5b..919f640 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-server</artifactId>
- <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/policy/pom.xml b/policy/pom.xml
index 273c553..2d0a5a4 100644
--- a/policy/pom.xml
+++ b/policy/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/policy/src/main/resources/catalog.bom b/policy/src/main/resources/catalog.bom
index 4960c14..b567766 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: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION
items:
- itemType: policy
diff --git a/pom.xml b/pom.xml
index 145b682..8dc76dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-server</artifactId>
- <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<packaging>pom</packaging>
<name>Brooklyn Server Root</name>
@@ -86,7 +86,7 @@
</repositories>
<properties>
- <brooklyn.version>1.1.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
+ <brooklyn.version>1.2.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
<org.osgi.core.version>7.0.0</org.osgi.core.version>
diff --git a/rest/rest-api/pom.xml b/rest/rest-api/pom.xml
index 617f831..6ed7fc6 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>1.1.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/rest/rest-resources/pom.xml b/rest/rest-resources/pom.xml
index a503b7f..5e63731 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>1.1.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/rest/rest-server/pom.xml b/rest/rest-server/pom.xml
index 60e26b5..fe4579f 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>1.1.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/server-cli/pom.xml b/server-cli/pom.xml
index 78981fb..4071ee7 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/software/base/pom.xml b/software/base/pom.xml
index 5f1048e..16e5236 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
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 3fb424d..d8009b0 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 @@
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, "1.1.0-SNAPSHOT"); // BROOKLYN_VERSION
+ public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "1.2.0-SNAPSHOT"); // BROOKLYN_VERSION
@SetFromFlag("distroUploadUrl")
public static final ConfigKey<String> DISTRO_UPLOAD_URL = ConfigKeys.newStringConfigKey(
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 15120b5..9dd8fb6 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
@@ -132,7 +132,7 @@
// 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/1.1.0-SNAPSHOT/brooklynnode-0.8.0-snapshot.tar.gz
+ // file://$HOME/.brooklyn/repository/BrooklynNode/1.2.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();
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 691b7b6..9035482 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 @@
public class JmxmpSslSupport {
- final static String BROOKLYN_VERSION = "1.1.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script)
+ final static String BROOKLYN_VERSION = "1.2.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script)
private final JmxSupport jmxSupport;
diff --git a/software/base/src/main/resources/catalog.bom b/software/base/src/main/resources/catalog.bom
index c69e0f7..d352567 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: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION
itemType: entity
items:
# other items added by catalog-brooklyn-software-base.bom provided by dist feature
diff --git a/software/winrm/pom.xml b/software/winrm/pom.xml
index 61923f2..bd24ce8 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index 931ea99..2a2f9cf 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>1.1.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/test-framework/src/main/resources/catalog.bom b/test-framework/src/main/resources/catalog.bom
index 8829e12..99b5ee8 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: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION
itemType: entity
items:
- id: org.apache.brooklyn.test.framework.TestSshCommand
diff --git a/test-support/pom.xml b/test-support/pom.xml
index c35d634..2472c30 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/common/dependencies/osgi/parent/pom.xml b/utils/common/dependencies/osgi/parent/pom.xml
index 0435187..beebdd8 100644
--- a/utils/common/dependencies/osgi/parent/pom.xml
+++ b/utils/common/dependencies/osgi/parent/pom.xml
@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../../../../../parent/pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/utils/common/pom.xml b/utils/common/pom.xml
index 01847fa..ce29418 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
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 045e0e9..66140f8 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 @@
// 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:1.1.0-SNAPSHOT"; // BROOKLYN_VERSION
+ final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:1.2.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 @@
@Test(groups={"Integration","Broken"})
public void testRetrievalHostedSnapshotIntegration() throws Exception {
MavenArtifact m = MavenArtifact.fromCoordinate(
- "org.apache.brooklyn:brooklyn-utils-common:jar:1.1.0-SNAPSHOT"); // BROOKLYN_VERSION
+ "org.apache.brooklyn:brooklyn-utils-common:jar:1.2.0-SNAPSHOT"); // BROOKLYN_VERSION
String localPath = new MavenRetriever().getLocalPath(m);
File f = new File(localPath);
diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml
index 5a0ec39..ffba309 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml
index 819f778..0883580 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml
index f3e1a96..22e0172 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index fd73dc6..17f4e83 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/rt-felix/pom.xml b/utils/rt-felix/pom.xml
index 192a7d3..339c23c 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml
index 2fa84cb..29c2986 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>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
