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/10/28 13:12:00 UTC
[3/7] incubator-brooklyn git commit: update license metadata esp for
docs following code review
update license metadata esp for docs following code review
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0218ee91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0218ee91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0218ee91
Branch: refs/heads/master
Commit: 0218ee913eb396aaf25fc04e45e725479d6d9fa3
Parents: ae89710
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 28 11:29:09 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 28 12:08:41 2015 +0000
----------------------------------------------------------------------
usage/dist/licensing/overrides.yaml | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0218ee91/usage/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/overrides.yaml b/usage/dist/licensing/overrides.yaml
index 4975587..b37d5d6 100644
--- a/usage/dist/licensing/overrides.yaml
+++ b/usage/dist/licensing/overrides.yaml
@@ -86,7 +86,7 @@
notices:
- Copyright (c) John Resig (2005-2011)
- "Includes code fragments from sizzle.js:"
- - " Copyright (c) jQuery Foundation and other contributors (2011)"
+ - " Copyright (c) The Dojo Foundation"
- " Available at http://sizzlejs.com"
- " Used under the MIT license"
@@ -100,9 +100,10 @@
organization: { name: "The jQuery Foundation", url: "http://jquery.org/" }
license: MIT
notices:
- - Copyright (c) John Resig (2005-2014)
+ - Copyright (c) The jQuery Foundation, Inc. and other contributors (2005-2014)
- "Includes code fragments from sizzle.js:"
- - " Copyright (c) jQuery Foundation and other contributors (2013)"
+ # NB: sizzle copyright changed from Dojo Foundation in 1.7.2
+ - " Copyright (c) The jQuery Foundation, Inc. and other contributors (2013)"
- " Available at http://sizzlejs.com"
- " Used under the MIT license"
@@ -174,29 +175,29 @@
- id: backbone.js
version: 1.0.0
url: http://backbonejs.org
- organization: { name: "DocumentCloud Inc", url: "http://www.documentcloud.org/" }
- notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013)
+ organization: { name: "DocumentCloud Inc.", url: "http://www.documentcloud.org/" }
+ notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2010-2013)
license: MIT
- id: bootstrap.js
version: 2.0.4
url: http://twitter.github.com/bootstrap/javascript.html#transitions
- notice: Copyright (c) Twitter, Inc (2012)
+ notice: Copyright (c) Twitter, Inc. (2012)
license: ASL2
# used in docs (not needed for licensing)
- id: bootstrap.js:3.1.1
version: 3.1.1
url: http://getbootstrap.com/
- notice: Copyright (c) Twitter, Inc (2011-2014)
+ notice: Copyright (c) Twitter, Inc. (2011-2014)
license: MIT
- id: underscore.js
version: 1.4.4
files: underscore*.{js,map}
url: http://underscorejs.org
- organization: { name: "DocumentCloud Inc", url: "http://www.documentcloud.org/" }
- notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2013)
+ organization: { name: "DocumentCloud Inc.", url: "http://www.documentcloud.org/" }
+ notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2009-2013)
license: MIT
# used in CLI (and in docs)
@@ -204,8 +205,8 @@
version: 1.7.0
files: underscore*.{js,map}
url: http://underscorejs.org
- organization: { name: "DocumentCloud Inc", url: "http://www.documentcloud.org/" }
- notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2014)
+ organization: { name: "DocumentCloud Inc.", url: "http://www.documentcloud.org/" }
+ notice: "Copyright (c) Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors (2009-2014)"
license: MIT
- id: async.js
@@ -303,6 +304,7 @@
# * plus the below:
- id: jquery.superfish.js
+ files: superfish.js
name: Superfish jQuery Menu Widget
version: 1.4.8
url: http://users.tpg.com.au/j_birch/plugins/superfish/