Skip to content

Updated to licence overrides for codemirror (JSGUI) #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Feb 8, 2016
Merged

Updated to licence overrides for codemirror (JSGUI) #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

This software is distributed under the Apache License, version 2.0. See (1) below.
This software is copyright (c) The Apache Software Foundation and contributors.

Expand Down Expand Up @@ -194,6 +193,12 @@ Contents:

(2) Notices for bundled software

This project includes the software: anyword-hint.js
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: async.js
Available at: https://github.com/p15martin/google-maps-hello-world/blob/master/js/libs/async.js
Developed by: Miller Medeiros (https://github.com/millermedeiros/)
Expand All @@ -214,6 +219,12 @@ This project includes the software: bootstrap.js
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) Twitter, Inc. (2012)

This project includes the software: codemirror.{js,css}
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: handlebars.js
Available at: https://github.com/wycats/handlebars.js
Developed by: Yehuda Katz (https://github.com/wycats/)
Expand Down Expand Up @@ -278,7 +289,7 @@ This project includes the software: js-uri
This project includes the software: js-yaml.js
Available at: https://github.com/nodeca/
Developed by: Vitaly Puzrin (https://github.com/nodeca/)
Version used: 3.2.7
Version used: 3.5.2
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Vitaly Puzrin (2011-2015)

Expand All @@ -296,6 +307,12 @@ This project includes the software: moment.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014)

This project includes the software: placeholder.js
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: RequireJS
Available at: http://requirejs.org/
Developed by: The Dojo Foundation (http://dojofoundation.org/)
Expand Down Expand Up @@ -330,6 +347,12 @@ This project includes the software: RequireJS (r.js maven plugin)
Arpad Borsos (2012)
Used under the BSD 2-Clause license.

This project includes the software: show-hint.{js,css}
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: Swagger UI
Available at: https://github.com/swagger-api/swagger-ui
Inclusive of: swagger*.{js,css,html}
Expand Down Expand Up @@ -360,6 +383,12 @@ This project includes the software: underscore.js:1.7.0
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors (2009-2014)

This project includes the software: yaml.js
Available at: http://codemirror.net/
Version used: 5.11.1
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
CodeMirror (c) Marijn Haverbeke and others

This project includes the software: ZeroClipboard
Available at: http://zeroclipboard.org/
Developed by: ZeroClipboard contributors (https://github.com/zeroclipboard)
Expand Down
32 changes: 31 additions & 1 deletion dist/licensing/overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,36 @@
url: http://twitter.github.com/bootstrap/javascript.html#transitions
notice: Copyright (c) Twitter, Inc. (2012)
license: ASL2

- id: codemirror.{js,css}

@ahgittin ahgittin Feb 8, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

normal process is for the ID to refer to a project with a single entry and have a files line containing the files used, instead of the 5 different blocks for the same project; no biggie tho, i'll update and merge

version: 5.11.1
url: http://codemirror.net/
notice: CodeMirror (c) Marijn Haverbeke and others
license: MIT

- id: show-hint.{js,css}
version: 5.11.1
url: http://codemirror.net/
notice: CodeMirror (c) Marijn Haverbeke and others
license: MIT

- id: placeholder.js
version: 5.11.1
url: http://codemirror.net/
notice: CodeMirror (c) Marijn Haverbeke and others
license: MIT

- id: anyword-hint.js
version: 5.11.1
url: http://codemirror.net/
notice: CodeMirror (c) Marijn Haverbeke and others
license: MIT

- id: yaml.js
version: 5.11.1
url: http://codemirror.net/
notice: CodeMirror (c) Marijn Haverbeke and others
license: MIT

# used in docs (not needed for licensing)
- id: bootstrap.js:3.1.1
Expand Down Expand Up @@ -325,7 +355,7 @@
notice: Copyright (c) js-uri contributors (2013)

- id: js-yaml.js
version: 3.2.7
version: 3.5.2
organization: { name: "Vitaly Puzrin", url: "https://github.com/nodeca/" }
url: https://github.com/nodeca/
notice: Copyright (c) Vitaly Puzrin (2011-2015)
Expand Down
Loading