Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D38CD200C2A for ; Tue, 14 Feb 2017 18:05:27 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D27FD160B5F; Tue, 14 Feb 2017 17:05:27 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E38B8160B78 for ; Tue, 14 Feb 2017 18:05:26 +0100 (CET) Received: (qmail 38247 invoked by uid 500); 14 Feb 2017 17:05:26 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 37996 invoked by uid 99); 14 Feb 2017 17:05:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2017 17:05:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89739E098A; Tue, 14 Feb 2017 17:05:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: svet@apache.org To: commits@brooklyn.apache.org Date: Tue, 14 Feb 2017 17:05:34 -0000 Message-Id: <5a5fa7988b6f4ca4a297ece3e78dcf28@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/12] brooklyn-dist git commit: Merge branch 'master' into docker archived-at: Tue, 14 Feb 2017 17:05:28 -0000 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 Authored: Tue Feb 14 16:57:41 2017 +0000 Committer: Alex Heneveld 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 ----------------------------------------------------------------------