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:34:54 UTC
incubator-brooklyn git commit: license files updated for r.js
inclusion
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 81f2e376c -> ac88adc95
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/ac88adc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ac88adc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ac88adc9
Branch: refs/heads/master
Commit: ac88adc95c3be272af699295be11ec7d86dfba56
Parents: 81f2e37
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Wed Sep 2 13:34:44 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Wed Sep 2 13:34:44 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/ac88adc9/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/ac88adc9/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/ac88adc9/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/)