brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [10/12] brooklyn-dist git commit: Merge branch 'master' into docker
Date Tue, 14 Feb 2017 17:05:34 GMT
Merge branch 'master' into docker


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/214f96e7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/214f96e7
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/214f96e7

Branch: refs/heads/master
Commit: 214f96e7e6881c86fd2a2056d97803dc55aec285
Parents: 5346fbb b6870d8
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Tue Feb 14 16:57:41 2017 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Tue Feb 14 16:57:41 2017 +0000

----------------------------------------------------------------------
 .mvn/jvm.config                                 |    1 +
 LICENSE                                         |   21 +-
 all/pom.xml                                     |    2 +-
 archetypes/quickstart/NOTES.txt                 |    2 +-
 archetypes/quickstart/pom.xml                   |    2 +-
 .../quickstart/src/brooklyn-sample/pom.xml      |    2 +-
 deb-packaging/pom.xml                           |    2 +-
 dist/licensing/.gitignore                       |    1 +
 dist/licensing/README.md                        |   19 +-
 dist/licensing/extras-files                     |    1 -
 dist/licensing/licenses/brooklyn-client/ASL2    |  177 ---
 .../licenses/brooklyn-client/BSD-3-Clause       |   27 -
 dist/licensing/licenses/brooklyn-client/MIT     |   20 -
 dist/licensing/licenses/cli/ASL2                |  177 +++
 dist/licensing/licenses/cli/BSD-3-Clause        |   27 +
 dist/licensing/licenses/cli/MIT                 |   20 +
 dist/licensing/overrides.yaml                   |   31 +-
 dist/licensing/projects-with-custom-licenses    |    2 +-
 dist/pom.xml                                    |    2 +-
 dist/src/main/dist/bin/brooklyn                 |    3 +
 dist/src/main/dist/bin/brooklyn.bat             |    1 +
 dist/src/main/license/files/LICENSE             |   84 +-
 downstream-parent/pom.xml                       |    5 +-
 karaf/apache-brooklyn/pom.xml                   |   55 +-
 .../apache-brooklyn/src/main/resources/LICENSE  | 1468 ++++++++++++++++++
 karaf/apache-brooklyn/src/main/resources/NOTICE |    5 +
 .../src/main/resources/bin/setenv               |   37 +-
 .../src/main/resources/etc/default.catalog.bom  |    2 +-
 ....apache.brooklyn.core.catalog.bomscanner.cfg |   27 -
 .../etc/org.apache.brooklyn.osgilauncher.cfg    |   65 -
 .../src/main/resources/etc/system.properties    |    9 -
 karaf/config/pom.xml                            |   62 +
 .../org.apache.brooklyn.classrename.cfg         |   21 +
 ....apache.brooklyn.core.catalog.bomscanner.cfg |   27 +
 .../org.apache.brooklyn.osgilauncher.cfg        |   67 +
 karaf/features/pom.xml                          |    4 +-
 karaf/features/src/main/feature/feature.xml     |   26 +-
 karaf/itest/pom.xml                             |    2 +-
 .../java/org/apache/brooklyn/AssemblyTest.java  |    1 -
 .../catalog/internal/CatalogBomScannerTest.java |    3 -
 .../launcher/osgi/OsgiLauncherTest.java         |   18 +-
 .../security/CustomSecurityProviderTest.java    |    1 +
 .../security/StockSecurityProviderTest.java     |    1 +
 karaf/pom.xml                                   |   12 +-
 pom.xml                                         |    2 +-
 release/Vagrantfile                             |   11 +-
 release/clone-and-configure-repos.sh            |    4 +-
 release/make-release-artifacts.sh               |   17 +-
 release/print-vote-email.sh                     |   17 +-
 release/settings.xml                            |   14 +
 release/verify_brooklyn_rc.sh                   |  200 +++
 rpm-packaging/pom.xml                           |    2 +-
 scripts/am                                      |   98 ++
 shared-packaging/pom.xml                        |    2 +-
 .../resources/service/systemd/brooklyn.service  |    2 +-
 .../resources/service/upstart/deb/brooklyn.conf |    2 +-
 .../resources/service/upstart/rpm/brooklyn.conf |    2 +-
 .../src/test/yaml/package-apps.yaml             |    8 +-
 shared-packaging/src/test/yaml/package.bom      |    2 +-
 vagrant/pom.xml                                 |    2 +-
 vagrant/src/main/vagrant/LICENSE                |  202 +++
 vagrant/src/main/vagrant/NOTICE                 |    5 +
 vagrant/src/main/vagrant/README.md              |    4 +-
 .../src/main/vagrant/files/install_brooklyn.sh  |    2 +-
 .../src/main/vagrant/files/vagrant-catalog.bom  |   10 +-
 vagrant/src/main/vagrant/servers.yaml           |   32 +-
 66 files changed, 2725 insertions(+), 457 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/214f96e7/pom.xml
----------------------------------------------------------------------


Mime
View raw message