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 7055910FA0 for ; Wed, 2 Sep 2015 12:37:31 +0000 (UTC) Received: (qmail 88493 invoked by uid 500); 2 Sep 2015 12:37:31 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 88469 invoked by uid 500); 2 Sep 2015 12:37:31 -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 88460 invoked by uid 99); 2 Sep 2015 12:37:31 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Sep 2015 12:37:31 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id C409C18233E for ; Wed, 2 Sep 2015 12:37:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.795 X-Spam-Level: * X-Spam-Status: No, score=1.795 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.006, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 3Kw_g3JrsDrL for ; Wed, 2 Sep 2015 12:37:16 +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 7D7D45071E for ; Wed, 2 Sep 2015 12:37:16 +0000 (UTC) Received: (qmail 88318 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 E55E0DFD40; Wed, 2 Sep 2015 12:37:15 +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:17 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/9] incubator-brooklyn git commit: add r.js to list of dependencies add r.js to list of dependencies Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/47151bea Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/47151bea Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/47151bea Branch: refs/heads/0.8.0-incubating Commit: 47151bea5bb80c61fa2941052b123ffeefeae2f6 Parents: d399741 Author: Alex Heneveld Authored: Wed Sep 2 09:54:06 2015 +0100 Committer: Alex Heneveld Committed: Wed Sep 2 13:36:33 2015 +0100 ---------------------------------------------------------------------- usage/dist/licensing/overrides.yaml | 10 ++++++++++ usage/jsgui/src/main/license/source-inclusions.yaml | 1 + 2 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/47151bea/usage/dist/licensing/overrides.yaml ---------------------------------------------------------------------- diff --git a/usage/dist/licensing/overrides.yaml b/usage/dist/licensing/overrides.yaml index e1952ba..6d2cf14 100644 --- a/usage/dist/licensing/overrides.yaml +++ b/usage/dist/licensing/overrides.yaml @@ -114,6 +114,16 @@ notice: Copyright (c) The Dojo Foundation (2010-2012) license: MIT +- id: require.js/r.js + # new ID because this is a different version to the above + name: RequireJS (r.js maven plugin) + files: r.js + version: 2.1.6 + url: http://github.com/jrburke/requirejs for details + organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" } + notice: Copyright (c) The Dojo Foundation (2010-2012) + license: MIT + - id: backbone.js version: 1.0.0 url: http://backbonejs.org http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/47151bea/usage/jsgui/src/main/license/source-inclusions.yaml ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/main/license/source-inclusions.yaml b/usage/jsgui/src/main/license/source-inclusions.yaml index a5bd59f..8592477 100644 --- a/usage/jsgui/src/main/license/source-inclusions.yaml +++ b/usage/jsgui/src/main/license/source-inclusions.yaml @@ -25,6 +25,7 @@ - id: Swagger JS - id: Swagger UI - id: require.js +- id: require.js/r.js - id: backbone.js - id: bootstrap.js - id: underscore.js