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 2015/09/02 14:37:17 UTC
[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 <al...@cloudsoftcorp.com>
Authored: Wed Sep 2 09:54:06 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
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