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-library.git
The following commit(s) were added to refs/heads/master by this push: new 5afd815a1 Change version to 1.2.0-SNAPSHOT 5afd815a1 is described below commit 5afd815a1337bc84dc9ff1fbf86e3de11fca2223 Author: Duncan Grant <duncan.gr...@cloudsoft.io> AuthorDate: Tue Jan 30 15:38:22 2024 +0000 Change version to 1.2.0-SNAPSHOT --- catalog-aliases/pom.xml | 2 +- catalog-aliases/src/main/resources/catalog.bom | 2 +- examples/pom.xml | 2 +- examples/simple-web-cluster/pom.xml | 2 +- .../src/main/resources/catalog.bom | 2 +- examples/webapps/hello-world-sql/pom.xml | 2 +- examples/webapps/hello-world-webapp/pom.xml | 2 +- examples/webapps/pom.xml | 2 +- karaf/catalog/pom.xml | 2 +- karaf/catalog/src/main/resources/catalog.bom | 24 +++++++++++----------- karaf/features/pom.xml | 2 +- karaf/pom.xml | 2 +- pom.xml | 2 +- qa/pom.xml | 2 +- .../test/projects/downstream-parent-test/pom.xml | 6 +++--- .../src/main/resources/catalog.bom | 2 +- .../resources/java-web-app-and-db-with-policy.bom | 2 +- qa/start-monitor.sh | 2 +- qa/start-webcluster.sh | 2 +- sandbox/cassandra-multicloud-snitch/pom.xml | 2 +- sandbox/database/pom.xml | 2 +- sandbox/extra/pom.xml | 2 +- sandbox/mobile-app/pom.xml | 2 +- sandbox/monitoring/pom.xml | 2 +- sandbox/monitoring/src/main/resources/catalog.bom | 2 +- sandbox/nosql/pom.xml | 2 +- software/cm/ansible/pom.xml | 2 +- software/cm/ansible/src/main/resources/catalog.bom | 2 +- software/cm/chef/pom.xml | 2 +- software/cm/chef/src/main/resources/catalog.bom | 2 +- software/cm/pom.xml | 4 ++-- software/cm/salt/pom.xml | 2 +- software/cm/salt/src/main/resources/catalog.bom | 2 +- software/database/pom.xml | 2 +- software/database/src/main/resources/catalog.bom | 2 +- software/messaging/pom.xml | 2 +- software/messaging/src/main/resources/catalog.bom | 4 ++-- software/monitoring/pom.xml | 2 +- software/monitoring/src/main/resources/catalog.bom | 2 +- software/network/pom.xml | 2 +- software/network/src/main/resources/catalog.bom | 2 +- software/nosql/pom.xml | 2 +- software/nosql/src/main/resources/catalog.bom | 2 +- software/osgi/pom.xml | 2 +- software/osgi/src/main/resources/catalog.bom | 2 +- software/webapp/pom.xml | 4 ++-- software/webapp/src/main/resources/catalog.bom | 2 +- 47 files changed, 63 insertions(+), 63 deletions(-) diff --git a/catalog-aliases/pom.xml b/catalog-aliases/pom.xml index 0e0550dc0..6928e395e 100644 --- a/catalog-aliases/pom.xml +++ b/catalog-aliases/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/catalog-aliases/src/main/resources/catalog.bom b/catalog-aliases/src/main/resources/catalog.bom index fb6240e64..ea8fafd6b 100644 --- a/catalog-aliases/src/main/resources/catalog.bom +++ b/catalog-aliases/src/main/resources/catalog.bom @@ -17,7 +17,7 @@ # this catalog bom contains some convenient aliases for simple usage. brooklyn.catalog: - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION itemType: entity items: diff --git a/examples/pom.xml b/examples/pom.xml index 2338c2a43..d095b4b83 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/examples/simple-web-cluster/pom.xml b/examples/simple-web-cluster/pom.xml index 97684cf0f..f71bea93d 100644 --- a/examples/simple-web-cluster/pom.xml +++ b/examples/simple-web-cluster/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/simple-web-cluster/src/main/resources/catalog.bom b/examples/simple-web-cluster/src/main/resources/catalog.bom index 9315bb1c8..cb9915328 100644 --- a/examples/simple-web-cluster/src/main/resources/catalog.bom +++ b/examples/simple-web-cluster/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: template items: - id: org.apache.brooklyn.demo.NodeJsTodoApplication diff --git a/examples/webapps/hello-world-sql/pom.xml b/examples/webapps/hello-world-sql/pom.xml index 91bc35d06..7ad39bf2e 100644 --- a/examples/webapps/hello-world-sql/pom.xml +++ b/examples/webapps/hello-world-sql/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-webapps-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/webapps/hello-world-webapp/pom.xml b/examples/webapps/hello-world-webapp/pom.xml index 181aa6a32..f2b82de15 100644 --- a/examples/webapps/hello-world-webapp/pom.xml +++ b/examples/webapps/hello-world-webapp/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-webapps-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/examples/webapps/pom.xml b/examples/webapps/pom.xml index 9a6573437..f285aa49a 100644 --- a/examples/webapps/pom.xml +++ b/examples/webapps/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn.example</groupId> <artifactId>brooklyn-examples-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> diff --git a/karaf/catalog/pom.xml b/karaf/catalog/pom.xml index 16b0eb236..25e1743b0 100644 --- a/karaf/catalog/pom.xml +++ b/karaf/catalog/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library-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/catalog/src/main/resources/catalog.bom b/karaf/catalog/src/main/resources/catalog.bom index 2b5e8840c..e8b636cd7 100644 --- a/karaf/catalog/src/main/resources/catalog.bom +++ b/karaf/catalog/src/main/resources/catalog.bom @@ -16,18 +16,18 @@ # under the License. # brooklyn.catalog: - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION brooklyn.libraries: - - mvn:org.apache.brooklyn/brooklyn-software-cm-ansible/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-software-cm-chef/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-software-cm-salt/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-software-database/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-software-messaging/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-software-monitoring/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-software-network/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-software-nosql/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-software-osgi/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-software-webapp/1.1.0-SNAPSHOT # BROOKLYN_VERSION - - mvn:org.apache.brooklyn/brooklyn-catalog-aliases/1.1.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-cm-ansible/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-cm-chef/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-cm-salt/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-database/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-messaging/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-monitoring/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-network/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-nosql/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-osgi/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-software-webapp/1.2.0-SNAPSHOT # BROOKLYN_VERSION + - mvn:org.apache.brooklyn/brooklyn-catalog-aliases/1.2.0-SNAPSHOT # BROOKLYN_VERSION diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml index e60fee69a..2c61f986b 100644 --- a/karaf/features/pom.xml +++ b/karaf/features/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library-karaf</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <artifactId>brooklyn-library-features</artifactId> diff --git a/karaf/pom.xml b/karaf/pom.xml index 34fffafae..2365eecc0 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/pom.xml b/pom.xml index f39fa0ad5..ad18899d7 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,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>../brooklyn-server/parent/</relativePath> </parent> diff --git a/qa/pom.xml b/qa/pom.xml index 505f63e51..bebaf1426 100644 --- a/qa/pom.xml +++ b/qa/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/qa/src/test/projects/downstream-parent-test/pom.xml b/qa/src/test/projects/downstream-parent-test/pom.xml index a4e947999..a07549824 100644 --- a/qa/src/test/projects/downstream-parent-test/pom.xml +++ b/qa/src/test/projects/downstream-parent-test/pom.xml @@ -23,7 +23,7 @@ <groupId>org.apache.brooklyn.downstream-parent-test</groupId> <artifactId>catalogue-load-test</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>jar</packaging> <name>Downstream parent catalogue load test test</name> @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-downstream-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> </parent> <repositories> @@ -62,7 +62,7 @@ <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-all</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <scope>provided</scope> </dependency> </dependencies> diff --git a/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom b/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom index 4530860b8..a9ea44cc1 100644 --- a/qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom +++ b/qa/src/test/projects/downstream-parent-test/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: com.example.HelloEntity diff --git a/qa/src/test/resources/java-web-app-and-db-with-policy.bom b/qa/src/test/resources/java-web-app-and-db-with-policy.bom index 86354639a..557748e7e 100644 --- a/qa/src/test/resources/java-web-app-and-db-with-policy.bom +++ b/qa/src/test/resources/java-web-app-and-db-with-policy.bom @@ -20,7 +20,7 @@ # standalone catalog file brooklyn.catalog: - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION items: - id: java-cluster-db-policy-example itemType: template diff --git a/qa/start-monitor.sh b/qa/start-monitor.sh index 890b4cff8..deaeaf126 100755 --- a/qa/start-monitor.sh +++ b/qa/start-monitor.sh @@ -25,7 +25,7 @@ #set -x # debug CLASS=org.apache.brooklyn.qa.longevity.Monitor -VERSION=1.1.0-SNAPSHOT # BROOKLYN_VERSION +VERSION=1.2.0-SNAPSHOT # BROOKLYN_VERSION ROOT=$(cd $(dirname $0) && pwd) cd $ROOT diff --git a/qa/start-webcluster.sh b/qa/start-webcluster.sh index 6ad1e96be..505af0113 100755 --- a/qa/start-webcluster.sh +++ b/qa/start-webcluster.sh @@ -25,7 +25,7 @@ #set -x # debug CLASS=org.apache.brooklyn.qa.longevity.webcluster.WebClusterApp -VERSION=1.1.0-SNAPSHOT # BROOKLYN_VERSION +VERSION=1.2.0-SNAPSHOT # BROOKLYN_VERSION ROOT=$(cd $(dirname $0) && pwd) cd $ROOT diff --git a/sandbox/cassandra-multicloud-snitch/pom.xml b/sandbox/cassandra-multicloud-snitch/pom.xml index c683736cb..f666ce5f4 100644 --- a/sandbox/cassandra-multicloud-snitch/pom.xml +++ b/sandbox/cassandra-multicloud-snitch/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/sandbox/database/pom.xml b/sandbox/database/pom.xml index d90eac424..26640f9f5 100644 --- a/sandbox/database/pom.xml +++ b/sandbox/database/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/sandbox/extra/pom.xml b/sandbox/extra/pom.xml index 7ec6a15ce..dc59b18a6 100644 --- a/sandbox/extra/pom.xml +++ b/sandbox/extra/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/sandbox/mobile-app/pom.xml b/sandbox/mobile-app/pom.xml index eda30172b..f25dbab7f 100644 --- a/sandbox/mobile-app/pom.xml +++ b/sandbox/mobile-app/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/sandbox/monitoring/pom.xml b/sandbox/monitoring/pom.xml index 2f1ab1d10..31b9e8976 100644 --- a/sandbox/monitoring/pom.xml +++ b/sandbox/monitoring/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/sandbox/monitoring/src/main/resources/catalog.bom b/sandbox/monitoring/src/main/resources/catalog.bom index 086ceb8e7..62137db4e 100644 --- a/sandbox/monitoring/src/main/resources/catalog.bom +++ b/sandbox/monitoring/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: - id: org.apache.brooklyn.entity.monitoring.zabbix.ZabbixServer item: diff --git a/sandbox/nosql/pom.xml b/sandbox/nosql/pom.xml index b230d745a..c2012aee4 100644 --- a/sandbox/nosql/pom.xml +++ b/sandbox/nosql/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/software/cm/ansible/pom.xml b/software/cm/ansible/pom.xml index 71912bf4a..769ad45d7 100644 --- a/software/cm/ansible/pom.xml +++ b/software/cm/ansible/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/software/cm/ansible/src/main/resources/catalog.bom b/software/cm/ansible/src/main/resources/catalog.bom index 26a834539..d7c51dece 100644 --- a/software/cm/ansible/src/main/resources/catalog.bom +++ b/software/cm/ansible/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.entity.cm.ansible.AnsibleEntity diff --git a/software/cm/chef/pom.xml b/software/cm/chef/pom.xml index fe238c4e5..b6a9daee4 100644 --- a/software/cm/chef/pom.xml +++ b/software/cm/chef/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/software/cm/chef/src/main/resources/catalog.bom b/software/cm/chef/src/main/resources/catalog.bom index 2d92c555f..c307525c0 100644 --- a/software/cm/chef/src/main/resources/catalog.bom +++ b/software/cm/chef/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.entity.chef.ChefEntity diff --git a/software/cm/pom.xml b/software/cm/pom.xml index 1d21efeac..3a08af34e 100644 --- a/software/cm/pom.xml +++ b/software/cm/pom.xml @@ -25,13 +25,13 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-software-cm</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <packaging>pom</packaging> <name>Brooklyn CM Integration Root</name> diff --git a/software/cm/salt/pom.xml b/software/cm/salt/pom.xml index c6a84f1a6..3f03a3235 100644 --- a/software/cm/salt/pom.xml +++ b/software/cm/salt/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/software/cm/salt/src/main/resources/catalog.bom b/software/cm/salt/src/main/resources/catalog.bom index b4153c594..a30c22f9c 100644 --- a/software/cm/salt/src/main/resources/catalog.bom +++ b/software/cm/salt/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.entity.cm.salt.SaltEntity diff --git a/software/database/pom.xml b/software/database/pom.xml index 520abb907..c575154b8 100644 --- a/software/database/pom.xml +++ b/software/database/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/software/database/src/main/resources/catalog.bom b/software/database/src/main/resources/catalog.bom index 604838976..701ef41f8 100644 --- a/software/database/src/main/resources/catalog.bom +++ b/software/database/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.entity.database.crate.CrateNode diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml index bab0942ad..27e30b7ac 100644 --- a/software/messaging/pom.xml +++ b/software/messaging/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/software/messaging/src/main/resources/catalog.bom b/software/messaging/src/main/resources/catalog.bom index 1bcd7c066..f4364068a 100644 --- a/software/messaging/src/main/resources/catalog.bom +++ b/software/messaging/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.entity.messaging.activemq.ActiveMQBroker @@ -27,7 +27,7 @@ brooklyn.catalog: description: ActiveMQ is an open source message broker which fully implements the Java Message Service 1.1 (JMS) - id: org.apache.brooklyn.entity.messaging.activemq-artemis iconUrl: classpath:///activemq-logo.png - version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION + version: "1.2.0-SNAPSHOT" # BROOKLYN_VERSION item: type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess name: ActiveMQ Artemis diff --git a/software/monitoring/pom.xml b/software/monitoring/pom.xml index ab91936fd..4219f11c0 100644 --- a/software/monitoring/pom.xml +++ b/software/monitoring/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/software/monitoring/src/main/resources/catalog.bom b/software/monitoring/src/main/resources/catalog.bom index 202a2c711..6495b812a 100644 --- a/software/monitoring/src/main/resources/catalog.bom +++ b/software/monitoring/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.entity.monitoring.monit.MonitNode diff --git a/software/network/pom.xml b/software/network/pom.xml index f362a8b71..c1ee7f568 100644 --- a/software/network/pom.xml +++ b/software/network/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/software/network/src/main/resources/catalog.bom b/software/network/src/main/resources/catalog.bom index 82230b779..7209731ab 100644 --- a/software/network/src/main/resources/catalog.bom +++ b/software/network/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.entity.network.bind.BindDnsServer diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml index e167bd931..36133f677 100644 --- a/software/nosql/pom.xml +++ b/software/nosql/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/software/nosql/src/main/resources/catalog.bom b/software/nosql/src/main/resources/catalog.bom index 6c72f568d..e3fc72f60 100644 --- a/software/nosql/src/main/resources/catalog.bom +++ b/software/nosql/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.entity.nosql.redis.RedisStore diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml index 58ef225b2..3f6931a7f 100644 --- a/software/osgi/pom.xml +++ b/software/osgi/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</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/software/osgi/src/main/resources/catalog.bom b/software/osgi/src/main/resources/catalog.bom index 418ba7988..ba87e8561 100644 --- a/software/osgi/src/main/resources/catalog.bom +++ b/software/osgi/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.entity.osgi.karaf.KarafContainer diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml index 047e38f14..80cff4fd1 100644 --- a/software/webapp/pom.xml +++ b/software/webapp/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-library</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> @@ -157,7 +157,7 @@ <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-camp</artifactId> - <version>1.1.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>1.2.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> <scope>test</scope> </dependency> <dependency> diff --git a/software/webapp/src/main/resources/catalog.bom b/software/webapp/src/main/resources/catalog.bom index 18e7e1770..70a49de00 100644 --- a/software/webapp/src/main/resources/catalog.bom +++ b/software/webapp/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.entity.webapp.nodejs.NodeJsWebAppService