You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2016/12/02 14:20:56 UTC
[1/3] brooklyn-dist git commit: Update license automation to current
project state
Repository: brooklyn-dist
Updated Branches:
refs/heads/master 80980e75d -> 8662ed3cd
Update license automation to current project state
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/96cc2b1a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/96cc2b1a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/96cc2b1a
Branch: refs/heads/master
Commit: 96cc2b1a9249353b9dd7d4752b53088906a5eb57
Parents: 40743fe
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Nov 25 17:39:32 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Nov 25 17:39:32 2016 +0200
----------------------------------------------------------------------
dist/licensing/.gitignore | 1 +
dist/licensing/README.md | 19 +-
dist/licensing/extras-files | 1 -
dist/licensing/licenses/brooklyn-client/ASL2 | 177 -------------------
.../licenses/brooklyn-client/BSD-3-Clause | 27 ---
dist/licensing/licenses/brooklyn-client/MIT | 20 ---
dist/licensing/licenses/cli/ASL2 | 177 +++++++++++++++++++
dist/licensing/licenses/cli/BSD-3-Clause | 27 +++
dist/licensing/licenses/cli/MIT | 20 +++
dist/licensing/overrides.yaml | 31 +++-
dist/licensing/projects-with-custom-licenses | 2 +-
11 files changed, 267 insertions(+), 235 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/96cc2b1a/dist/licensing/.gitignore
----------------------------------------------------------------------
diff --git a/dist/licensing/.gitignore b/dist/licensing/.gitignore
index 2d17061..14172bf 100644
--- a/dist/licensing/.gitignore
+++ b/dist/licensing/.gitignore
@@ -1,2 +1,3 @@
LICENSE.autogenerated
notices.autogenerated
+extras-files
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/96cc2b1a/dist/licensing/README.md
----------------------------------------------------------------------
diff --git a/dist/licensing/README.md b/dist/licensing/README.md
index 94ae070..edc0d9b 100644
--- a/dist/licensing/README.md
+++ b/dist/licensing/README.md
@@ -2,12 +2,27 @@
We use a special maven plugin and scripts to automatically create the LICENSE
files, including all notices, based on metadata in overrides.yaml and **/source-inclusions.yaml.
-First install https://github.com/ahgittin/license-audit-maven-plugin
-and then, in the usage/dist/ project of Brooklyn...
+First install https://github.com/ahgittin/license-audit-maven-plugin
+# Update license information
+
+**TODO**: Need to re-work the script for the first Karaf-based release.
+
+* Check if new projects are added to `brooklyn-client/cli/glide.yaml`; compare to and update `/brooklyn-client/cli/release/license/source-inclusions.yaml` && `overrides.yaml`
+* Check for new/updated projects in UI (in `src/main/webapp/assets/js/libs`, `src/main/webapp/assets/css`); compare to and update `brooklyn-jsgui/src/main/license/source-inclusions.yaml` && `overrides.yaml`
+* Check for newly introduced non-jar dependencies, add create corresponding `source-inclusions.yaml`. For example `brooklyn-server/server-cli/src/main/license/source-inclusions.yaml`.
+
+In the `brooklyn-dist/dist/licensing` folder execute:
+
+./make-all-licenses.sh || ( echo 'FAILED!!!' && rm LICENSE.autogenerated )
+
+Cross check with running `mvn project-info-reports:dependencies` and checking the output at `target/site/dependencies.html`
+
# Quick Usage
+In the usage/dist/ project of Brooklyn...
+
To see a tree of license info:
mvn org.heneveld.maven:license-audit-maven-plugin:report \
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/96cc2b1a/dist/licensing/extras-files
----------------------------------------------------------------------
diff --git a/dist/licensing/extras-files b/dist/licensing/extras-files
deleted file mode 100644
index 1b00b9c..0000000
--- a/dist/licensing/extras-files
+++ /dev/null
@@ -1 +0,0 @@
-../../brooklyn-ui/src/main/license/source-inclusions.yaml:../../brooklyn-server/server-cli/src/main/license/source-inclusions.yaml:../../brooklyn-client/release/license/source-inclusions.yaml
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/96cc2b1a/dist/licensing/licenses/brooklyn-client/ASL2
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/brooklyn-client/ASL2 b/dist/licensing/licenses/brooklyn-client/ASL2
deleted file mode 100644
index eccbc6a..0000000
--- a/dist/licensing/licenses/brooklyn-client/ASL2
+++ /dev/null
@@ -1,177 +0,0 @@
-Apache License, Version 2.0
-
- 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/brooklyn-dist/blob/96cc2b1a/dist/licensing/licenses/brooklyn-client/BSD-3-Clause
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/brooklyn-client/BSD-3-Clause b/dist/licensing/licenses/brooklyn-client/BSD-3-Clause
deleted file mode 100644
index be2692c..0000000
--- a/dist/licensing/licenses/brooklyn-client/BSD-3-Clause
+++ /dev/null
@@ -1,27 +0,0 @@
-The BSD 3-Clause License ("New BSD")
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/96cc2b1a/dist/licensing/licenses/brooklyn-client/MIT
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/brooklyn-client/MIT b/dist/licensing/licenses/brooklyn-client/MIT
deleted file mode 100644
index 71dfb45..0000000
--- a/dist/licensing/licenses/brooklyn-client/MIT
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License ("MIT")
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/96cc2b1a/dist/licensing/licenses/cli/ASL2
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/cli/ASL2 b/dist/licensing/licenses/cli/ASL2
new file mode 100644
index 0000000..eccbc6a
--- /dev/null
+++ b/dist/licensing/licenses/cli/ASL2
@@ -0,0 +1,177 @@
+Apache License, Version 2.0
+
+ 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/brooklyn-dist/blob/96cc2b1a/dist/licensing/licenses/cli/BSD-3-Clause
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/cli/BSD-3-Clause b/dist/licensing/licenses/cli/BSD-3-Clause
new file mode 100644
index 0000000..be2692c
--- /dev/null
+++ b/dist/licensing/licenses/cli/BSD-3-Clause
@@ -0,0 +1,27 @@
+The BSD 3-Clause License ("New BSD")
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ 3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/96cc2b1a/dist/licensing/licenses/cli/MIT
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/cli/MIT b/dist/licensing/licenses/cli/MIT
new file mode 100644
index 0000000..71dfb45
--- /dev/null
+++ b/dist/licensing/licenses/cli/MIT
@@ -0,0 +1,20 @@
+The MIT License ("MIT")
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/96cc2b1a/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/dist/licensing/overrides.yaml b/dist/licensing/overrides.yaml
index f779825..c2d04d6 100644
--- a/dist/licensing/overrides.yaml
+++ b/dist/licensing/overrides.yaml
@@ -101,13 +101,21 @@
# used in brooklyn-client (Go project)
-- id: github.com/codegangsta/cli
- url: https://github.com/codegangsta/cli
- name: github.com/codegangsta/cli
- description: A small package for building command line apps in Go
+- id: github.com/urfave/cli
+ url: https://github.com/urfave/cli
+ name: github.com/urfave/cli
+ description: A simple, fast, and fun package for building command line apps in Go
license: MIT
notices:
- - Copyright (C) 2013 Jeremy Saenz
+ - Copyright (c) 2016 Jeremy Saenz & Contributors
+
+- id: github.com/NodePrime/jsonpath/cli/jsonpath
+ url: github.com/NodePrime/jsonpath/
+ name: github.com/NodePrime/jsonpath/cli/jsonpath
+ description: OpenSource JSON-Path
+ license: MIT
+ notices:
+ - Copyright (c) 2015 NodePrime Inc.
- id: golang.org/x/crypto/ssh
url: https://godoc.org/golang.org/x/crypto/ssh
@@ -168,7 +176,7 @@
# not used anymore? swagger-ui includes what it needs, it seems.
- id: swagger:2.1.6
name: Swagger JS
- files: swagger-client.js
+ files: swagger-client.js swagger.css
version: 2.1.6
url: https://github.com/swagger-api/swagger-js
license: ASL2
@@ -259,7 +267,7 @@
license: MIT
- id: jquery.easy-autocomplete.js
- version: 1.3.1
+ version: 1.3.3
url: https://github.com/pawelczak/EasyAutocomplete
notice: Copyright (c) \u0141ukasz Pawe\u0142czak (2015)
license: MIT
@@ -322,6 +330,15 @@
notice: Copyright (c) "Cowboy" Ben Alman (2010)"
license: MIT
+- id: jquery.ba-bbq.js-hashchange
+ name: "jQuery hashchange event"
+ files: jquery.ba-bbq*.js
+ version: 1.2
+ url: http://benalman.com/projects/jquery-hashchange-plugin/
+ organization: { name: "\"Cowboy\" Ben Alman", url: "http://benalman.com/" }
+ notice: Copyright (c) "Cowboy" Ben Alman (2010)"
+ license: MIT
+
- id: moment.js
version: 2.1.0
url: http://momentjs.com
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/96cc2b1a/dist/licensing/projects-with-custom-licenses
----------------------------------------------------------------------
diff --git a/dist/licensing/projects-with-custom-licenses b/dist/licensing/projects-with-custom-licenses
index 8020d9e..9fddf57 100644
--- a/dist/licensing/projects-with-custom-licenses
+++ b/dist/licensing/projects-with-custom-licenses
@@ -7,5 +7,5 @@
../../brooklyn-server/server-cli
# client has "go" structure so license in a different place
-../../brooklyn-client release/license
+../../brooklyn-client/cli release/license
[3/3] brooklyn-dist git commit: This closes #62
Posted by ge...@apache.org.
This closes #62
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/8662ed3c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/8662ed3c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/8662ed3c
Branch: refs/heads/master
Commit: 8662ed3cde8dc8f4f36143e3b2aeb64cd12c9b36
Parents: 80980e7 5fcf90d
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Fri Dec 2 14:20:42 2016 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Fri Dec 2 14:20:42 2016 +0000
----------------------------------------------------------------------
LICENSE | 21 ++-
dist/licensing/.gitignore | 1 +
dist/licensing/README.md | 19 +-
dist/licensing/extras-files | 1 -
dist/licensing/licenses/brooklyn-client/ASL2 | 177 -------------------
.../licenses/brooklyn-client/BSD-3-Clause | 27 ---
dist/licensing/licenses/brooklyn-client/MIT | 20 ---
dist/licensing/licenses/cli/ASL2 | 177 +++++++++++++++++++
dist/licensing/licenses/cli/BSD-3-Clause | 27 +++
dist/licensing/licenses/cli/MIT | 20 +++
dist/licensing/overrides.yaml | 31 +++-
dist/licensing/projects-with-custom-licenses | 2 +-
dist/src/main/license/files/LICENSE | 72 ++++----
13 files changed, 321 insertions(+), 274 deletions(-)
----------------------------------------------------------------------
[2/3] brooklyn-dist git commit: Update LICENSE files to current
project state
Posted by ge...@apache.org.
Update LICENSE files to current project state
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/5fcf90d4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/5fcf90d4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/5fcf90d4
Branch: refs/heads/master
Commit: 5fcf90d46478bdf8a45cfb97095e84848aa1227c
Parents: 96cc2b1
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Nov 25 17:45:34 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Nov 25 17:45:34 2016 +0200
----------------------------------------------------------------------
LICENSE | 21 ++++++++--
dist/src/main/license/files/LICENSE | 72 ++++++++++++++++----------------
2 files changed, 54 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5fcf90d4/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index ccac2ba..ba06157 100644
--- a/LICENSE
+++ b/LICENSE
@@ -235,10 +235,15 @@ This project includes the software: Font Awesome (fonts)
Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
Copyright (c) Dave Gandy (2016)
-This project includes the software: github.com/codegangsta/cli
- Available at: https://github.com/codegangsta/cli
+This project includes the software: github.com/NodePrime/jsonpath/cli/jsonpath
+ Available at: github.com/NodePrime/jsonpath/
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (C) 2013 Jeremy Saenz
+ Copyright (c) 2015 NodePrime Inc.
+
+This project includes the software: github.com/urfave/cli
+ Available at: https://github.com/urfave/cli
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) 2016 Jeremy Saenz & Contributors
This project includes the software: golang.org/x/crypto/ssh
Available at: https://godoc.org/golang.org/x/crypto/ssh
@@ -273,6 +278,14 @@ This project includes the software: jQuery BBQ: Back Button & Query Library
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) "Cowboy" Ben Alman (2010)"
+This project includes the software: jQuery hashchange event
+ Available at: http://benalman.com/projects/jquery-hashchange-plugin/
+ Developed by: "Cowboy" Ben Alman (http://benalman.com/)
+ Inclusive of: jquery.ba-bbq*.js
+ Version used: 1.2
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) "Cowboy" Ben Alman (2010)"
+
This project includes the software: DataTables Table plug-in for jQuery
Available at: http://www.datatables.net/
Developed by: SpryMedia Ltd (http://sprymedia.co.uk/)
@@ -283,7 +296,7 @@ This project includes the software: DataTables Table plug-in for jQuery
This project includes the software: jquery.easy-autocomplete.js
Available at: https://github.com/pawelczak/EasyAutocomplete
- Version used: 1.3.1
+ Version used: 1.3.3
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) \u0141ukasz Pawe\u0142czak (2015)
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5fcf90d4/dist/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/dist/src/main/license/files/LICENSE b/dist/src/main/license/files/LICENSE
index 7380122..f9be36e 100644
--- a/dist/src/main/license/files/LICENSE
+++ b/dist/src/main/license/files/LICENSE
@@ -239,33 +239,33 @@ This project includes the software: codemirror.js
CodeMirror (c) Marijn Haverbeke and others
This project includes the software: com.fasterxml.jackson.core
- Available at: http://github.com/FasterXML/jackson https://github.com/FasterXML/jackson
+ Available at: http://github.com/FasterXML/jackson https://github.com/FasterXML/jackson-core
Developed by: FasterXML (http://fasterxml.com/)
- Version used: 2.4.5
+ Version used: 2.7.5
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.dataformat
- Available at: https://github.com/FasterXML/jackson http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding
+ Available at: http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding https://github.com/FasterXML/jackson
Developed by: FasterXML (http://fasterxml.com/)
- Version used: 2.4.5
+ Version used: 2.7.5
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.datatype
- Available at: http://wiki.fasterxml.com/JacksonModuleJoda
+ Available at: https://github.com/FasterXML/jackson-datatypes-collections http://wiki.fasterxml.com/JacksonModuleJoda
Developed by: FasterXML (http://fasterxml.com/)
- Version used: 2.4.5
+ Version used: 2.7.5
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.jaxrs
Available at: http://wiki.fasterxml.com/JacksonHome
Developed by: FasterXML (http://fasterxml.com/)
- Version used: 2.4.5
+ Version used: 2.7.5
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.module
- Available at: http://wiki.fasterxml.com/JacksonJAXBAnnotations
+ Available at: http://github.com/FasterXML/jackson-module-jaxb-annotations
Developed by: FasterXML (http://fasterxml.com/)
- Version used: 2.4.5
+ Version used: 2.7.5
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.google.code.findbugs
@@ -281,13 +281,7 @@ This project includes the software: com.google.code.gson
This project includes the software: com.google.guava
Available at: http://code.google.com/p/guava-libraries
- Version used: 17.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: com.google.http-client
- Available at: http://code.google.com/p/google-http-java-client/
- Developed by: Google (http://www.google.com/)
- Version used: 1.18.0-rc
+ Version used: 16.0.1
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.google.inject
@@ -302,11 +296,6 @@ This project includes the software: com.google.inject.extensions
Version used: 3.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: com.googlecode.concurrentlinkedhashmap
- Available at: http://code.google.com/p/concurrentlinkedhashmap
- Version used: 1.0_jdk5
- Used under the following license: Apache License (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
This project includes the software: com.jamesmurty.utils
Available at: https://github.com/jmurty/java-xmlbuilder
Version used: 1.1
@@ -326,13 +315,13 @@ This project includes the software: com.jcraft
This project includes the software: com.maxmind.db
Available at: http://dev.maxmind.com/
Developed by: MaxMind, Inc. (http://www.maxmind.com/)
- Version used: 0.3.4
+ Version used: 1.2.1
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.html)
This project includes the software: com.maxmind.geoip2
Available at: http://dev.maxmind.com/geoip/geoip2/web-services
Developed by: MaxMind, Inc. (http://www.maxmind.com/)
- Version used: 0.8.1
+ Version used: 2.8.0-rc1
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.html)
This project includes the software: com.squareup.okhttp
@@ -354,7 +343,7 @@ This project includes the software: com.sun.xml.bind
This project includes the software: com.thoughtworks.xstream
Available at: http://x-stream.github.io/
Developed by: XStream (http://xstream.codehaus.org)
- Version used: 1.4.7
+ Version used: 1.4.8
Used under the following license: BSD License (http://xstream.codehaus.org/license.html)
This project includes the software: commons-beanutils
@@ -413,10 +402,15 @@ This project includes the software: Font Awesome (fonts)
Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
Copyright (c) Dave Gandy (2016)
-This project includes the software: github.com/codegangsta/cli
- Available at: https://github.com/codegangsta/cli
+This project includes the software: github.com/NodePrime/jsonpath/cli/jsonpath
+ Available at: github.com/NodePrime/jsonpath/
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) 2015 NodePrime Inc.
+
+This project includes the software: github.com/urfave/cli
+ Available at: https://github.com/urfave/cli
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (C) 2013 Jeremy Saenz
+ Copyright (c) 2016 Jeremy Saenz & Contributors
This project includes the software: golang.org/x/crypto/ssh
Available at: https://godoc.org/golang.org/x/crypto/ssh
@@ -438,12 +432,12 @@ 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.3.5
+ Version used: 0.4.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
Available at: https://github.com/swagger-api/swagger-core
- Version used: 1.5.3
+ Version used: 1.5.6
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.html)
This project includes the software: javax.annotation
@@ -477,9 +471,9 @@ This project includes the software: javax.ws.rs
Used under the following license: Common Development and Distribution License, version 1.1 (http://glassfish.java.net/public/CDDL+GPL_1_1.html)
This project includes the software: joda-time
- Available at: http://joda-time.sourceforge.net
+ Available at: http://www.joda.org/joda-time/
Developed by: Joda.org (http://www.joda.org)
- Version used: 2.2
+ Version used: 2.4
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
This project includes the software: jQuery JavaScript Library
@@ -502,6 +496,14 @@ This project includes the software: jQuery BBQ: Back Button & Query Library
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) "Cowboy" Ben Alman (2010)"
+This project includes the software: jQuery hashchange event
+ Available at: http://benalman.com/projects/jquery-hashchange-plugin/
+ Developed by: "Cowboy" Ben Alman (http://benalman.com/)
+ Inclusive of: jquery.ba-bbq*.js
+ Version used: 1.2
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) "Cowboy" Ben Alman (2010)"
+
This project includes the software: DataTables Table plug-in for jQuery
Available at: http://www.datatables.net/
Developed by: SpryMedia Ltd (http://sprymedia.co.uk/)
@@ -512,7 +514,7 @@ This project includes the software: DataTables Table plug-in for jQuery
This project includes the software: jquery.easy-autocomplete.js
Available at: https://github.com/pawelczak/EasyAutocomplete
- Version used: 1.3.1
+ Version used: 1.3.3
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) \u0141ukasz Pawe\u0142czak (2015)
@@ -604,7 +606,7 @@ This project includes the software: org.apache.cxf
This project includes the software: org.apache.felix
Available at: http://felix.apache.org/
Developed by: The Apache Software Foundation (http://www.apache.org/)
- Version used: 4.4.0
+ Version used: 5.4.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: org.apache.httpcomponents
@@ -748,8 +750,8 @@ This project includes the software: org.tukaani
This project includes the software: org.yaml
Available at: http://www.snakeyaml.org
- Version used: 1.11
- Used under the following license: Apache License, version 2.0 (in-project reference: LICENSE.txt)
+ Version used: 1.16
+ Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
This project includes the software: RequireJS
Available at: http://requirejs.org/