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 2016/01/30 04:38:54 UTC
[29/29] incubator-brooklyn git commit: update LICENSE files throughout
update LICENSE files throughout
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a6f32193
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a6f32193
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a6f32193
Branch: refs/heads/master
Commit: a6f32193dbd557b4171086d4529247098eef447d
Parents: d8a3873
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sat Jan 30 03:33:08 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Sat Jan 30 03:33:08 2016 +0000
----------------------------------------------------------------------
LICENSE | 18 +-
brooklyn-dist/LICENSE | 20 +-
.../dist/src/main/license/files/LICENSE | 30 ++-
brooklyn-docs/LICENSE | 20 +-
brooklyn-docs/LICENSE.txt | 189 -------------------
brooklyn-library/LICENSE | 20 +-
brooklyn-server/LICENSE | 20 +-
brooklyn-ui/LICENSE | 35 +---
brooklyn-ui/src/main/license/files/LICENSE | 11 +-
9 files changed, 75 insertions(+), 288 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6f32193/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 6d18497..3d8f4e7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -250,13 +250,6 @@ This project includes the software: DataTables Table plug-in for jQuery
Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
Copyright (c) Allan Jardine (2008-2012)
-This project includes the software: glossarizer
- Available at: https://github.com/PebbleRoad/glossarizer
- Developed by: Vinay M, PebbleRoad Pte Ltd (http://www.pebbleroad.com)
- Version used: 1.5
- Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) Vinay M, PebbleRoad Pte Ltd (2004-2016)
-
This project includes the software: jQuery Form Plugin
Available at: https://github.com/malsup/form
Developed by: Mike Alsup (http://malsup.com/)
@@ -337,11 +330,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: swagger
- Used under the following license: <no license info>
-
-This project includes the software: swagger-ui
- Used under the following license: <no license info>
+This project includes the software: Swagger UI
+ Available at: https://github.com/swagger-api/swagger-ui
+ Inclusive of: swagger*.{js,css,html}
+ Version used: 2.1.4
+ Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ Copyright (c) SmartBear Software (2011-2015)
This project includes the software: typeahead.js
Available at: https://github.com/twitter/typeahead.js
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6f32193/brooklyn-dist/LICENSE
----------------------------------------------------------------------
diff --git a/brooklyn-dist/LICENSE b/brooklyn-dist/LICENSE
index ca60394..3d8f4e7 100644
--- a/brooklyn-dist/LICENSE
+++ b/brooklyn-dist/LICENSE
@@ -282,6 +282,13 @@ This project includes the software: js-yaml.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Vitaly Puzrin (2011-2015)
+This project includes the software: marked.js
+ Available at: https://github.com/chjj/marked
+ Developed by: Christopher Jeffrey (https://github.com/chjj)
+ Version used: 0.3.1
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) Christopher Jeffrey (2011-2014)
+
This project includes the software: moment.js
Available at: http://momentjs.com
Developed by: Tim Wood (http://momentjs.com)
@@ -323,17 +330,10 @@ 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: Swagger JS
- Available at: https://github.com/wordnik/swagger-js
- Inclusive of: swagger.js
- Version used: 1.0.1
- Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- Copyright (c) SmartBear Software (2011-2015)
-
This project includes the software: Swagger UI
- Available at: https://github.com/wordnik/swagger-ui
- Inclusive of: swagger-ui.js
- Version used: 1.0.1
+ Available at: https://github.com/swagger-api/swagger-ui
+ Inclusive of: swagger*.{js,css,html}
+ Version used: 2.1.4
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) SmartBear Software (2011-2015)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6f32193/brooklyn-dist/dist/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/src/main/license/files/LICENSE b/brooklyn-dist/dist/src/main/license/files/LICENSE
index 39db9db..dd42819 100644
--- a/brooklyn-dist/dist/src/main/license/files/LICENSE
+++ b/brooklyn-dist/dist/src/main/license/files/LICENSE
@@ -413,7 +413,7 @@ This project includes the software: io.airlift
This project includes the software: io.cloudsoft.windows
Available at: http://github.com/cloudsoft/winrm4j
- Version used: 0.1.0
+ Version used: 0.2.0
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
This project includes the software: io.swagger
@@ -576,37 +576,37 @@ This project includes the software: org.apache.httpcomponents
This project includes the software: org.apache.jclouds
Available at: http://jclouds.apache.org/
Developed by: The Apache Software Foundation (http://www.apache.org/)
- Version used: 1.9.1
+ Version used: 1.9.2
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.jclouds.api
Available at: http://jclouds.apache.org/
Developed by: The Apache Software Foundation (http://www.apache.org/)
- Version used: 1.9.1
+ Version used: 1.9.2
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.jclouds.common
Available at: http://jclouds.apache.org/
Developed by: The Apache Software Foundation (http://www.apache.org/)
- Version used: 1.9.1
+ Version used: 1.9.2
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.jclouds.driver
Available at: http://jclouds.apache.org/
Developed by: The Apache Software Foundation (http://www.apache.org/)
- Version used: 1.9.1
+ Version used: 1.9.2
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.jclouds.labs
Available at: http://jclouds.apache.org/
Developed by: The Apache Software Foundation (http://www.apache.org/)
- Version used: 1.9.1
+ Version used: 1.9.2
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.jclouds.provider
Available at: http://jclouds.apache.org/
Developed by: The Apache Software Foundation (http://www.apache.org/)
- Version used: 1.9.1
+ Version used: 1.9.2
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.bouncycastle
@@ -678,11 +678,6 @@ This project includes the software: org.mongodb
Version used: 3.0.3
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.python
- Available at: http://www.jython.org/
- Version used: 2.7-b3
- Used under the following license: Jython Software License (http://www.jython.org/license.html)
-
This project includes the software: org.reflections
Available at: http://code.google.com/p/reflections/
Version used: 0.9.9-RC1
@@ -738,11 +733,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: swagger
- Used under the following license: <no license info>
-
-This project includes the software: swagger-ui
- Used under the following license: <no license info>
+This project includes the software: Swagger UI
+ Available at: https://github.com/swagger-api/swagger-ui
+ Inclusive of: swagger*.{js,css,html}
+ Version used: 2.1.4
+ Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ Copyright (c) SmartBear Software (2011-2015)
This project includes the software: typeahead.js
Available at: https://github.com/twitter/typeahead.js
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6f32193/brooklyn-docs/LICENSE
----------------------------------------------------------------------
diff --git a/brooklyn-docs/LICENSE b/brooklyn-docs/LICENSE
index ca60394..3d8f4e7 100644
--- a/brooklyn-docs/LICENSE
+++ b/brooklyn-docs/LICENSE
@@ -282,6 +282,13 @@ This project includes the software: js-yaml.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Vitaly Puzrin (2011-2015)
+This project includes the software: marked.js
+ Available at: https://github.com/chjj/marked
+ Developed by: Christopher Jeffrey (https://github.com/chjj)
+ Version used: 0.3.1
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) Christopher Jeffrey (2011-2014)
+
This project includes the software: moment.js
Available at: http://momentjs.com
Developed by: Tim Wood (http://momentjs.com)
@@ -323,17 +330,10 @@ 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: Swagger JS
- Available at: https://github.com/wordnik/swagger-js
- Inclusive of: swagger.js
- Version used: 1.0.1
- Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- Copyright (c) SmartBear Software (2011-2015)
-
This project includes the software: Swagger UI
- Available at: https://github.com/wordnik/swagger-ui
- Inclusive of: swagger-ui.js
- Version used: 1.0.1
+ Available at: https://github.com/swagger-api/swagger-ui
+ Inclusive of: swagger*.{js,css,html}
+ Version used: 2.1.4
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) SmartBear Software (2011-2015)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6f32193/brooklyn-docs/LICENSE.txt
----------------------------------------------------------------------
diff --git a/brooklyn-docs/LICENSE.txt b/brooklyn-docs/LICENSE.txt
deleted file mode 100644
index 99953f7..0000000
--- a/brooklyn-docs/LICENSE.txt
+++ /dev/null
@@ -1,189 +0,0 @@
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this content except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
- (This is included below for reference.)
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6f32193/brooklyn-library/LICENSE
----------------------------------------------------------------------
diff --git a/brooklyn-library/LICENSE b/brooklyn-library/LICENSE
index ca60394..3d8f4e7 100644
--- a/brooklyn-library/LICENSE
+++ b/brooklyn-library/LICENSE
@@ -282,6 +282,13 @@ This project includes the software: js-yaml.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Vitaly Puzrin (2011-2015)
+This project includes the software: marked.js
+ Available at: https://github.com/chjj/marked
+ Developed by: Christopher Jeffrey (https://github.com/chjj)
+ Version used: 0.3.1
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) Christopher Jeffrey (2011-2014)
+
This project includes the software: moment.js
Available at: http://momentjs.com
Developed by: Tim Wood (http://momentjs.com)
@@ -323,17 +330,10 @@ 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: Swagger JS
- Available at: https://github.com/wordnik/swagger-js
- Inclusive of: swagger.js
- Version used: 1.0.1
- Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- Copyright (c) SmartBear Software (2011-2015)
-
This project includes the software: Swagger UI
- Available at: https://github.com/wordnik/swagger-ui
- Inclusive of: swagger-ui.js
- Version used: 1.0.1
+ Available at: https://github.com/swagger-api/swagger-ui
+ Inclusive of: swagger*.{js,css,html}
+ Version used: 2.1.4
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) SmartBear Software (2011-2015)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6f32193/brooklyn-server/LICENSE
----------------------------------------------------------------------
diff --git a/brooklyn-server/LICENSE b/brooklyn-server/LICENSE
index ca60394..3d8f4e7 100644
--- a/brooklyn-server/LICENSE
+++ b/brooklyn-server/LICENSE
@@ -282,6 +282,13 @@ This project includes the software: js-yaml.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Vitaly Puzrin (2011-2015)
+This project includes the software: marked.js
+ Available at: https://github.com/chjj/marked
+ Developed by: Christopher Jeffrey (https://github.com/chjj)
+ Version used: 0.3.1
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) Christopher Jeffrey (2011-2014)
+
This project includes the software: moment.js
Available at: http://momentjs.com
Developed by: Tim Wood (http://momentjs.com)
@@ -323,17 +330,10 @@ 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: Swagger JS
- Available at: https://github.com/wordnik/swagger-js
- Inclusive of: swagger.js
- Version used: 1.0.1
- Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- Copyright (c) SmartBear Software (2011-2015)
-
This project includes the software: Swagger UI
- Available at: https://github.com/wordnik/swagger-ui
- Inclusive of: swagger-ui.js
- Version used: 1.0.1
+ Available at: https://github.com/swagger-api/swagger-ui
+ Inclusive of: swagger*.{js,css,html}
+ Version used: 2.1.4
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) SmartBear Software (2011-2015)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6f32193/brooklyn-ui/LICENSE
----------------------------------------------------------------------
diff --git a/brooklyn-ui/LICENSE b/brooklyn-ui/LICENSE
index ca60394..58c78f1 100644
--- a/brooklyn-ui/LICENSE
+++ b/brooklyn-ui/LICENSE
@@ -282,6 +282,13 @@ This project includes the software: js-yaml.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Vitaly Puzrin (2011-2015)
+This project includes the software: marked.js
+ Available at: https://github.com/chjj/marked
+ Developed by: Christopher Jeffrey (https://github.com/chjj)
+ Version used: 0.3.1
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) Christopher Jeffrey (2011-2014)
+
This project includes the software: moment.js
Available at: http://momentjs.com
Developed by: Tim Wood (http://momentjs.com)
@@ -323,27 +330,13 @@ 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: Swagger JS
- Available at: https://github.com/wordnik/swagger-js
- Inclusive of: swagger.js
- Version used: 1.0.1
- Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- Copyright (c) SmartBear Software (2011-2015)
-
This project includes the software: Swagger UI
- Available at: https://github.com/wordnik/swagger-ui
- Inclusive of: swagger-ui.js
- Version used: 1.0.1
+ Available at: https://github.com/swagger-api/swagger-ui
+ Inclusive of: swagger*.{js,css,html}
+ Version used: 2.1.4
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
Copyright (c) SmartBear Software (2011-2015)
-This project includes the software: typeahead.js
- Available at: https://github.com/twitter/typeahead.js
- Developed by: Twitter, Inc (http://twitter.com)
- Version used: 0.10.5
- Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) Twitter, Inc. and other contributors (2013-2014)
-
This project includes the software: underscore.js
Available at: http://underscorejs.org
Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
@@ -352,14 +345,6 @@ This project includes the software: underscore.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) Jeremy Ashkenas, DocumentCloud Inc. (2009-2013)
-This project includes the software: underscore.js:1.7.0
- Available at: http://underscorejs.org
- Developed by: DocumentCloud Inc. (http://www.documentcloud.org/)
- Inclusive of: underscore*.{js,map}
- Version used: 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: ZeroClipboard
Available at: http://zeroclipboard.org/
Developed by: ZeroClipboard contributors (https://github.com/zeroclipboard)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a6f32193/brooklyn-ui/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/brooklyn-ui/src/main/license/files/LICENSE b/brooklyn-ui/src/main/license/files/LICENSE
index 3b3b73d..58c78f1 100644
--- a/brooklyn-ui/src/main/license/files/LICENSE
+++ b/brooklyn-ui/src/main/license/files/LICENSE
@@ -330,11 +330,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: swagger
- Used under the following license: <no license info>
-
-This project includes the software: swagger-ui
- Used under the following license: <no license info>
+This project includes the software: Swagger UI
+ Available at: https://github.com/swagger-api/swagger-ui
+ Inclusive of: swagger*.{js,css,html}
+ Version used: 2.1.4
+ Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ Copyright (c) SmartBear Software (2011-2015)
This project includes the software: underscore.js
Available at: http://underscorejs.org