You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2020/07/22 12:18:39 UTC
[brooklyn-library] 04/05: Merge branch 'master' into
license-update-2020
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git
commit 5d9d91120eeaa306b87d4aa7bb09a7de5ae3c487
Merge: 5e10626 7fa2f20
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Jun 2 10:02:29 2020 +0100
Merge branch 'master' into license-update-2020
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 | 66 ++++++++++++++++------
karaf/pom.xml | 2 +-
pom.xml | 4 +-
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 | 4 +-
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, 112 insertions(+), 82 deletions(-)