Repository: incubator-brooklyn Updated Branches: refs/heads/master 404b7e02b -> 6d0089086
note where different JS versions are used in cli build and docs as compared with js gui Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ae89710e Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ae89710e Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ae89710e Branch: refs/heads/master Commit: ae89710ece477d6212d250a0752edca66ed9ac67 Parents: ed2e1e7 Author: Alex Heneveld <[email protected]> Authored: Mon Oct 26 21:50:13 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Wed Oct 28 12:05:21 2015 +0000 ---------------------------------------------------------------------- .../cli/src/main/license/source-inclusions.yaml | 2 +- usage/dist/licensing/overrides.yaml | 60 +++++++++++++++++++- 2 files changed, 60 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ae89710e/usage/cli/src/main/license/source-inclusions.yaml ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/license/source-inclusions.yaml b/usage/cli/src/main/license/source-inclusions.yaml index 93c9d25..aab3212 100644 --- a/usage/cli/src/main/license/source-inclusions.yaml +++ b/usage/cli/src/main/license/source-inclusions.yaml @@ -20,5 +20,5 @@ # extras file for org.heneveld.license-audit-maven-plugin # listing projects from which *source* files are included -- id: underscore.js +- id: underscore.js:1.7.0 - id: typeahead.js http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ae89710e/usage/dist/licensing/overrides.yaml ---------------------------------------------------------------------- diff --git a/usage/dist/licensing/overrides.yaml b/usage/dist/licensing/overrides.yaml index ec57f4e..4975587 100644 --- a/usage/dist/licensing/overrides.yaml +++ b/usage/dist/licensing/overrides.yaml @@ -84,12 +84,28 @@ organization: { name: "The jQuery Foundation", url: "http://jquery.org/"; } license: MIT notices: - - Copyright (c) John Resig (2011) + - Copyright (c) John Resig (2005-2011) - "Includes code fragments from sizzle.js:" - " Copyright (c) jQuery Foundation and other contributors (2011)" - " Available at http://sizzlejs.com"; - " Used under the MIT license" +# used in docs (not reported) +- id: jquery-core:2.1.1 + url: http://jquery.com/ + description: JS library for manipulating HTML and eventing + name: jQuery JavaScript Library + files: jquery.js + version: 2.1.1 + organization: { name: "The jQuery Foundation", url: "http://jquery.org/"; } + license: MIT + notices: + - Copyright (c) John Resig (2005-2014) + - "Includes code fragments from sizzle.js:" + - " Copyright (c) jQuery Foundation and other contributors (2013)" + - " Available at http://sizzlejs.com"; + - " Used under the MIT license" + - id: swagger name: Swagger JS files: swagger.js @@ -167,6 +183,13 @@ url: http://twitter.github.com/bootstrap/javascript.html#transitions 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) + license: MIT - id: underscore.js version: 1.4.4 @@ -176,6 +199,15 @@ notice: Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2009-2013) license: MIT +# used in CLI (and in docs) +- id: underscore.js:1.7.0 + 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) + license: MIT + - id: async.js version: 0.1.1 url: https://github.com/p15martin/google-maps-hello-world/blob/master/js/libs/async.js @@ -259,3 +291,29 @@ notice: Copyright (c) Twitter, Inc. and other contributors (2013-2014) license: MIT +# DOCS files +# +# we don't do a distributable docs build -- they are just online. +# (docs are excluded from the source build, and not bundled with the binary build.) +# so these are not used currently; but for completeness and in case we change our minds, +# here they are: + +# * different versions of jquery, bootstrap, and underscore noted above, +# * media items github octicons and font-awesome fonts, not listed +# * plus the below: + +- id: jquery.superfish.js + name: Superfish jQuery Menu Widget + version: 1.4.8 + url: http://users.tpg.com.au/j_birch/plugins/superfish/ + notice: Copyright (c) Joel Birch (2008) + license: MIT + +- id: jquery.cookie.js + name: jQuery Cookie Plugin + version: 1.3.1 + url: https://github.com/carhartl/jquery-cookie + notice: Copyright (c) 2013 Klaus Hartl + license: MIT + +
