Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5C06510FAC for ; Wed, 2 Sep 2015 12:37:47 +0000 (UTC) Received: (qmail 88894 invoked by uid 500); 2 Sep 2015 12:37:42 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 88869 invoked by uid 500); 2 Sep 2015 12:37:42 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 88860 invoked by uid 99); 2 Sep 2015 12:37:42 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Sep 2015 12:37:42 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id D1D3CF0DAF for ; Wed, 2 Sep 2015 12:37:41 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id qFJQ1Y9pr-PZ for ; Wed, 2 Sep 2015 12:37:26 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id A544250748 for ; Wed, 2 Sep 2015 12:37:16 +0000 (UTC) Received: (qmail 88334 invoked by uid 99); 2 Sep 2015 12:37:16 -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; Wed, 02 Sep 2015 12:37:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 126A4E1144; Wed, 2 Sep 2015 12:37:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Wed, 02 Sep 2015 12:37:23 -0000 Message-Id: <20f20ad22e46456f9054dfb4650278fa@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [9/9] incubator-brooklyn git commit: license files updated for r.js inclusion license files updated for r.js inclusion Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5d951450 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5d951450 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5d951450 Branch: refs/heads/0.8.0-incubating Commit: 5d95145073564abf5ada8f99487d4be92d834fbd Parents: 7c2781e Author: Alex Heneveld Authored: Wed Sep 2 13:34:44 2015 +0100 Committer: Alex Heneveld Committed: Wed Sep 2 13:37:10 2015 +0100 ---------------------------------------------------------------------- LICENSE | 6 ++++++ usage/dist/src/main/license/files/LICENSE | 12 +++++++----- usage/jsgui/src/main/license/files/LICENSE | 6 ++++++ 3 files changed, 19 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5d951450/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 047405c..2741d5d 100644 --- a/LICENSE +++ b/LICENSE @@ -265,6 +265,12 @@ This project includes the software: require.js Used under the following license: The MIT License (http://opensource.org/licenses/MIT) Copyright (c) The Dojo Foundation (2010-2012) +This project includes the software: require.js/r.js + Available at: http://github.com/jrburke/requirejs for details + Developed by: The Dojo Foundation (http://dojofoundation.org/) + Used under the following license: The MIT License (http://opensource.org/licenses/MIT) + Copyright (c) The Dojo Foundation (2010-2012) + This project includes the software: sizzle.js Available at: http://sizzlejs.com/ Developed by: The jQuery Foundation (http://jquery.org/) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5d951450/usage/dist/src/main/license/files/LICENSE ---------------------------------------------------------------------- diff --git a/usage/dist/src/main/license/files/LICENSE b/usage/dist/src/main/license/files/LICENSE index a00784b..e66f276 100644 --- a/usage/dist/src/main/license/files/LICENSE +++ b/usage/dist/src/main/license/files/LICENSE @@ -225,10 +225,6 @@ This project includes the software: ch.qos.logback Developed by: QOS.ch (http://www.qos.ch) Used under the following license: Eclipse Public License, version 1.0 (http://www.eclipse.org/legal/epl-v10.html) -This project includes the software: com.beust - Available at: http://beust.com/jcommander - Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - This project includes the software: com.fasterxml.jackson Available at: http://wiki.fasterxml.com/JacksonHome http://wiki.fasterxml.com/JacksonJAXBAnnotations Developed by: FasterXML (http://fasterxml.com/) @@ -446,7 +442,7 @@ This project includes the software: org.99soft.guice Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) This project includes the software: org.apache.brooklyn - Available at: https://brooklyn.incubator.apache.org/brooklyn-parent/ + Available at: https://brooklyn.incubator.apache.org/ Developed by: The Apache Software Foundation (http://www.apache.org/) Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -553,6 +549,12 @@ This project includes the software: require.js Used under the following license: The MIT License (http://opensource.org/licenses/MIT) Copyright (c) The Dojo Foundation (2010-2012) +This project includes the software: require.js/r.js + Available at: http://github.com/jrburke/requirejs for details + Developed by: The Dojo Foundation (http://dojofoundation.org/) + Used under the following license: The MIT License (http://opensource.org/licenses/MIT) + Copyright (c) The Dojo Foundation (2010-2012) + This project includes the software: sizzle.js Available at: http://sizzlejs.com/ Developed by: The jQuery Foundation (http://jquery.org/) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5d951450/usage/jsgui/src/main/license/files/LICENSE ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/main/license/files/LICENSE b/usage/jsgui/src/main/license/files/LICENSE index 68dcfe5..fa518b1 100644 --- a/usage/jsgui/src/main/license/files/LICENSE +++ b/usage/jsgui/src/main/license/files/LICENSE @@ -265,6 +265,12 @@ This project includes the software: require.js Used under the following license: The MIT License (http://opensource.org/licenses/MIT) Copyright (c) The Dojo Foundation (2010-2012) +This project includes the software: require.js/r.js + Available at: http://github.com/jrburke/requirejs for details + Developed by: The Dojo Foundation (http://dojofoundation.org/) + Used under the following license: The MIT License (http://opensource.org/licenses/MIT) + Copyright (c) The Dojo Foundation (2010-2012) + This project includes the software: sizzle.js Available at: http://sizzlejs.com/ Developed by: The jQuery Foundation (http://jquery.org/)