This is an automated email from the ASF dual-hosted git repository.
duncangrant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new f2a35dc6ee Change version to 1.2.0-SNAPSHOT
f2a35dc6ee is described below
commit f2a35dc6eea23cf9c6ee9bd93efb223abd7bcd9f
Author: Duncan Grant <duncan.gr...@cloudsoft.io>
AuthorDate: Tue Jan 30 15:38:22 2024 +0000
Change version to 1.2.0-SNAPSHOT
---
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 +-
.../java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java | 4 ++--
core/src/test/resources/catalog.bom | 2 +-
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.bom | 2 +-
karaf/jetty-config/pom.xml | 2 +-
karaf/pom.xml | 2 +-
karaf/start/pom.xml | 2 +-
launcher-common/pom.xml | 2 +-
launcher/pom.xml | 2 +-
locations/container/pom.xml | 2 +-
locations/container/src/test/resources/generic-application.tests.bom | 2 +-
locations/container/src/test/resources/generic.tests.bom | 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 +-
software/base/pom.xml | 2 +-
.../java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java | 2 +-
.../apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java | 2 +-
.../main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java | 2 +-
software/base/src/main/resources/catalog.bom | 2 +-
software/winrm/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/parent/pom.xml | 2 +-
utils/common/pom.xml | 2 +-
.../test/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 +-
52 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index b0c79523e1..e9a5a36a2a 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 5620159954..172fec5a53 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 26e529e1de..5e09be5d51 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 db1f56cd52..4c13a4021e 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 62189f11e7..4552b47ac8 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 a0979a6b48..12dcd7d542 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 5aa64f2060..26cca4840d 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 @@ 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 = "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 a1cb2d74b8..3ae192c45e 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 6cde61c3dc..9817f871a0 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 @@ public class OsgiStandaloneTest extends OsgiTestBase {
@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 @@ public class OsgiStandaloneTest extends OsgiTestBase {
@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 66a0a696fa..a081f4af9a 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 d10cd8ff1c..458dfa662f 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 9b4e90197f..a0284a10e1 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 30a6962121..a5d932fd35 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 23b1736476..b86d04df02 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 5993ec6c73..ba10136645 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 36e2764560..a52d871cf6 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 cfaad5eee3..acd1e959d6 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 a41b9ef9f3..41cc40f7ff 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 3dd4806393..00bba431f1 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 d68c9bc684..fdad11e1eb 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 6bf2ada563..2a65e3c99a 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 292e2d2a6b..6c3dd3829a 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 7d469ceb86..e21213234a 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 c2c7398818..031f602f6d 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 965e24b041..9522be8aab 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 90cddd6b09..188787ead2 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 a6b1a5b993..919f640bff 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 273c553bb0..2d0a5a40ca 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 4960c1459f..b5677666b9 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 145b682e60..8dc76dd65c 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 617f831ce5..6ed7fc6ca6 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 a503b7fbcb..5e637313ad 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 60e26b5c6a..fe4579fb3e 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 78981fb474..4071ee7efb 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 5f1048e218..16e5236214 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 3fb424d779..d8009b06bb 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,
"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 15120b570d..9dd8fb60e6 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 @@ 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/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 691b7b62a5..9035482fdf 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 = "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 c69e0f71d4..d352567482 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 61923f2c66..bd24ce8fdb 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 931ea99464..2a2f9cfae6 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 8829e1266e..99b5ee86d9 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 c35d634604..2472c3027f 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 043518796c..beebdd83c3 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 01847fa2a5..ce29418887 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 045e0e9580..66140f8829 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: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 @@ public class MavenArtifactTest {
@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 5a0ec39879..ffba309acc 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 819f778535..08835802b9 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 f3e1a963af..22e017292d 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 fd73dc65ef..17f4e839b6 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 192a7d3e7b..339c23cbfd 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 2fa84cb351..29c2986c5a 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>
