Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 88205485d -> 7177e2070


Updates for license for brooklyn-client, now working.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/1bf00c1e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/1bf00c1e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/1bf00c1e

Branch: refs/heads/master
Commit: 1bf00c1e9405747ffe5b1543d8e62ca8b3fa6774
Parents: 7d55d53
Author: Geoff Macartney <geoff.macart...@cloudsoftcorp.com>
Authored: Fri Feb 26 12:17:16 2016 +0000
Committer: Geoff Macartney <geoff.macart...@cloudsoftcorp.com>
Committed: Wed Mar 9 20:21:13 2016 +0000

----------------------------------------------------------------------
 LICENSE                                      | 203 ++++++++++++++++++++++
 dist/licensing/extras-files                  |   2 +-
 dist/licensing/licenses/brooklyn-client/ASL2 | 177 +++++++++++++++++++
 dist/licensing/licenses/source/ASL2          | 177 +++++++++++++++++++
 dist/licensing/make-one-license.sh           |   2 +-
 dist/licensing/overrides.yaml                |  14 --
 dist/licensing/projects-with-custom-licenses |   2 +-
 dist/src/main/license/files/LICENSE          | 132 +++++++++-----
 8 files changed, 651 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/1bf00c1e/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 739a8a4..13e9bcc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -221,6 +221,30 @@ This project includes the software: codemirror.js
   Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
   CodeMirror (c) Marijn Haverbeke and others
 
+This project includes the software: Font Awesome (code)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/{css,scss,less}/*
+  Version used: 4.5.0
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Dave Gandy (2016)
+
+This project includes the software: Font Awesome (fonts)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/fonts/*
+  Version used: 4.5.0
+  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
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (C) 2013 Jeremy Saenz
+
+This project includes the software: golang.org/x/crypto/ssh
+  Available at: https://godoc.org/golang.org/x/crypto/ssh
+  Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
+  Copyright (c) 2009 The Go Authors. All rights reserved.
+
 This project includes the software: handlebars.js
   Available at: https://github.com/wycats/handlebars.js
   Developed by: Yehuda Katz (https://github.com/wycats/)
@@ -382,11 +406,190 @@ This project includes the software: ZeroClipboard
 
 Contents:
 
+  Apache License, Version 2.0
   The BSD 2-Clause License
   The BSD 3-Clause License ("New BSD")
   The MIT License ("MIT")
 
 
+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.
+  
+
 The BSD 2-Clause License
 
   Redistribution and use in source and binary forms, with or without

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/1bf00c1e/dist/licensing/extras-files
----------------------------------------------------------------------
diff --git a/dist/licensing/extras-files b/dist/licensing/extras-files
index 3aab21e..ef1652b 100644
--- a/dist/licensing/extras-files
+++ b/dist/licensing/extras-files
@@ -1 +1 @@
-../../brooklyn-ui/src/main/license/source-inclusions.yaml:../../brooklyn-server/server-cli/src/main/license/source-inclusions.yaml:../../brooklyn-server/rest/rest-server/src/main/license/source-inclusions.yaml
+../../brooklyn-ui/src/main/license/source-inclusions.yaml:../../brooklyn-server/server-cli/src/main/license/source-inclusions.yaml:../../brooklyn-client/src/main/license/source-inclusions.yaml

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/1bf00c1e/dist/licensing/licenses/brooklyn-client/ASL2
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/brooklyn-client/ASL2 
b/dist/licensing/licenses/brooklyn-client/ASL2
new file mode 100644
index 0000000..eccbc6a
--- /dev/null
+++ b/dist/licensing/licenses/brooklyn-client/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/1bf00c1e/dist/licensing/licenses/source/ASL2
----------------------------------------------------------------------
diff --git a/dist/licensing/licenses/source/ASL2 
b/dist/licensing/licenses/source/ASL2
new file mode 100644
index 0000000..eccbc6a
--- /dev/null
+++ b/dist/licensing/licenses/source/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/1bf00c1e/dist/licensing/make-one-license.sh
----------------------------------------------------------------------
diff --git a/dist/licensing/make-one-license.sh 
b/dist/licensing/make-one-license.sh
index ea462e2..c20009d 100755
--- a/dist/licensing/make-one-license.sh
+++ b/dist/licensing/make-one-license.sh
@@ -54,7 +54,7 @@ echo "(2) Notices for bundled software"
 echo
 pushd .. > /dev/null
 # add -X on next line to get debug info
-mvn -X org.heneveld.maven:license-audit-maven-plugin:notices \
+mvn org.heneveld.maven:license-audit-maven-plugin:notices \
         
-DlicensesPreferred=ASL2,ASL,EPL1,BSD-2-Clause,BSD-3-Clause,CDDL1.1,CDDL1,CDDL \
         -DoverridesFile=licensing/overrides.yaml \
         -DextrasFiles=${BROOKLYN_LICENSE_EXTRAS_FILES:-`cat 
licensing/extras-files`} \

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/1bf00c1e/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/dist/licensing/overrides.yaml b/dist/licensing/overrides.yaml
index 2618878..f85021a 100644
--- a/dist/licensing/overrides.yaml
+++ b/dist/licensing/overrides.yaml
@@ -117,20 +117,6 @@
   notices:
   - Copyright (c) 2009 The Go Authors. All rights reserved.
 
-# Used in brooklyn-server/rest/rest-server
-- id: xml-resolver:1.2
-  url: http://xml.apache.org/commons/components/resolver/
-  name: XML Commons Resolver Component
-  description: xml-commons provides an Apache-hosted set of DOM, SAX, and JAXP 
interfaces for use in other xml-based projects.
-  license: ASL-2
-  notices:
-  - Apache XML Commons Resolver
-  - Copyright 2006 The Apache Software Foundation.
-  - This product includes software developed at
-  - The Apache Software Foundation http://www.apache.org/
-  - Portions of this code are derived from classes placed in the public domain 
by Arbortext on 10 Apr 2000. See
-  - 
http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm
-
 # used in UI
 - id: jquery-core:1.7.2
   url: http://jquery.com/

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/1bf00c1e/dist/licensing/projects-with-custom-licenses
----------------------------------------------------------------------
diff --git a/dist/licensing/projects-with-custom-licenses 
b/dist/licensing/projects-with-custom-licenses
index 5c5afb9..0d58898 100644
--- a/dist/licensing/projects-with-custom-licenses
+++ b/dist/licensing/projects-with-custom-licenses
@@ -1,4 +1,4 @@
 ../../brooklyn-ui
 ../../brooklyn-server/server-cli
-../../brooklyn-server/rest/rest-server
+../../brooklyn-client
 

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/1bf00c1e/dist/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/dist/src/main/license/files/LICENSE 
b/dist/src/main/license/files/LICENSE
index f9e2138..b08cf44 100644
--- a/dist/src/main/license/files/LICENSE
+++ b/dist/src/main/license/files/LICENSE
@@ -345,17 +345,11 @@ This project includes the software: com.squareup.okio
   Version used: 1.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: com.sun.jersey
-  Available at: https://jersey.java.net/
+This project includes the software: com.sun.xml.bind
+  Available at: http://jaxb.java.net
   Developed by: Oracle Corporation (http://www.oracle.com/)
-  Version used: 1.19
-  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: com.sun.jersey.contribs
-  Available at: https://jersey.java.net/
-  Developed by: Oracle Corporation (http://www.oracle.com/)
-  Version used: 1.19
-  Used under the following license: Common Development and Distribution 
License, version 1.1 (http://glassfish.java.net/public/CDDL+GPL_1_1.html)
+  Version used: 2.2.11
+  Used under the following license: CDDL+GPL License 
(http://glassfish.java.net/public/CDDL+GPL_1_1.html)
 
 This project includes the software: com.thoughtworks.xstream
   Available at: http://x-stream.github.io/
@@ -405,6 +399,30 @@ This project includes the software: dom4j
   Version used: 1.6.1
   Used under the following license: MetaStuff BSD style license (3-clause) 
(http://dom4j.sourceforge.net/dom4j-1.6.1/license.html)
 
+This project includes the software: Font Awesome (code)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/{css,scss,less}/*
+  Version used: 4.5.0
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (c) Dave Gandy (2016)
+
+This project includes the software: Font Awesome (fonts)
+  Available at: http://fontawesome.io/
+  Inclusive of: font-awesome/fonts/*
+  Version used: 4.5.0
+  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
+  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
+  Copyright (C) 2013 Jeremy Saenz
+
+This project includes the software: golang.org/x/crypto/ssh
+  Available at: https://godoc.org/golang.org/x/crypto/ssh
+  Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
+  Copyright (c) 2009 The Go Authors. All rights reserved.
+
 This project includes the software: handlebars.js
   Available at: https://github.com/wycats/handlebars.js
   Developed by: Yehuda Katz (https://github.com/wycats/)
@@ -420,7 +438,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.2.0
+  Version used: 0.3.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: io.swagger
@@ -429,9 +447,12 @@ This project includes the software: io.swagger
   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
-  Available at: https://jcp.org/en/jsr/detail?id=250
-  Version used: 1.0
-  Used under the following license: Common Development and Distribution 
License, version 1.0 (https://glassfish.dev.java.net/public/CDDLv1.0.html)
+  Available at: https://jcp.org/en/jsr/detail?id=250 
http://jcp.org/en/jsr/detail?id=250
+  Developed by: GlassFish Community (https://glassfish.java.net)
+  Version used: 1.0; 1.2
+  Used under the following licenses:
+    Common Development and Distribution License, version 1.0 
(https://glassfish.dev.java.net/public/CDDLv1.0.html)
+    CDDL + GPLv2 with classpath exception 
(https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html)
 
 This project includes the software: javax.inject
   Available at: http://code.google.com/p/atinject/
@@ -450,10 +471,10 @@ This project includes the software: javax.validation
   Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 This project includes the software: javax.ws.rs
-  Available at: https://jsr311.java.net/
-  Developed by: Sun Microsystems, Inc (http://www.sun.com/)
-  Version used: 1.1.1
-  Used under the following license: CDDL License 
(http://www.opensource.org/licenses/cddl1.php)
+  Available at: http://jax-rs-spec.java.net
+  Developed by: Oracle Corporation (http://www.oracle.com/)
+  Version used: 2.0.1
+  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
@@ -568,6 +589,12 @@ This project includes the software: org.apache.commons
   Version used: 3.3.2; 1.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: org.apache.cxf
+  Available at: http://cxf.apache.org
+  Developed by: The Apache Software Foundation (http://www.apache.org/)
+  Version used: 3.1.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: org.apache.felix
   Available at: http://felix.apache.org/
   Developed by: The Apache Software Foundation (http://www.apache.org/)
@@ -575,10 +602,12 @@ This project includes the software: org.apache.felix
   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
-  Available at: http://hc.apache.org/httpcomponents-client-ga 
http://hc.apache.org/httpcomponents-core-ga
+  Available at: http://hc.apache.org/httpcomponents-core-ga 
http://hc.apache.org/httpcomponents-asyncclient 
http://hc.apache.org/httpcomponents-client-ga
   Developed by: The Apache Software Foundation (http://www.apache.org/)
-  Version used: 4.4.1
-  Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+  Version used: 4.4.1; 4.1
+  Used under the following licenses:
+    Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+    Apache License, version 2.0 (in-project reference: LICENSE.txt)
 
 This project includes the software: org.apache.jclouds
   Available at: http://jclouds.apache.org/
@@ -616,6 +645,18 @@ This project includes the software: 
org.apache.jclouds.provider
   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.neethi
+  Available at: http://ws.apache.org/neethi/
+  Developed by: The Apache Software Foundation (http://www.apache.org/)
+  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.apache.ws.xmlschema
+  Available at: http://ws.apache.org/commons/xmlschema20/
+  Developed by: The Apache Software Foundation (http://www.apache.org/)
+  Version used: 2.2.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: org.bouncycastle
   Available at: http://www.bouncycastle.org/java.html
   Version used: 1.49
@@ -627,21 +668,13 @@ This project includes the software: org.codehaus.groovy
   Version used: 2.3.7
   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.codehaus.jackson
-  Available at: http://jackson.codehaus.org
-  Developed by: FasterXML (http://fasterxml.com)
-  Version used: 1.9.13
-  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.codehaus.jettison
-  Version used: 1.1
-  Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0)
-
 This project includes the software: org.codehaus.woodstox
-  Available at: http://wiki.fasterxml.com/WoodstoxStax2
-  Developed by: fasterxml.com (http://fasterxml.com)
-  Version used: 3.1.4
-  Used under the following license: BSD License 
(http://www.opensource.org/licenses/bsd-license.php)
+  Available at: http://woodstox.codehaus.org 
http://wiki.fasterxml.com/WoodstoxStax2
+  Developed by: Codehaus (http://www.codehaus.org/) fasterxml.com 
(http://fasterxml.com)
+  Version used: 4.4.1; 3.1.4
+  Used under the following licenses:
+    Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+    BSD License (http://www.opensource.org/licenses/bsd-license.php)
 
 This project includes the software: org.eclipse.jetty
   Available at: http://www.eclipse.org/jetty
@@ -674,17 +707,23 @@ This project includes the software: org.javassist
   Version used: 3.16.1-GA
   Used under the following license: Apache License, version 2.0 
(http://www.mozilla.org/MPL/MPL-1.1.html)
 
-This project includes the software: org.jvnet.mimepull
-  Available at: http://mimepull.java.net
-  Developed by: Oracle Corporation (http://www.oracle.com/)
-  Version used: 1.9.3
-  Used under the following license: Common Development and Distribution 
License, version 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
-
 This project includes the software: org.mongodb
   Available at: http://www.mongodb.org
   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.osgi
+  Available at: http://www.osgi.org
+  Developed by: OSGi Alliance (http://www.osgi.org)
+  Version used: 6.0.0
+  Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0)
+
+This project includes the software: org.ow2.asm
+  Available at: http://asm.objectweb.org/
+  Developed by: ObjectWeb (http://www.objectweb.org/)
+  Version used: 5.0.4
+  Used under the following license: BSD License 
(http://asm.objectweb.org/license.html)
+
 This project includes the software: org.reflections
   Available at: http://code.google.com/p/reflections/
   Version used: 0.9.9-RC1
@@ -770,6 +809,17 @@ 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: wsdl4j
+  Available at: http://sf.net/projects/wsdl4j
+  Version used: 1.6.3
+  Used under the following license: Common Public License 
(http://www.opensource.org/licenses/cpl1.0.txt)
+
+This project includes the software: xml-resolver
+  Available at: http://xml.apache.org/commons/components/resolver/
+  Developed by: Apache Software Foundation (http://www.apache.org/)
+  Version used: 1.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: xmlpull
   Available at: http://www.xmlpull.org
   Version used: 1.1.3.1

Reply via email to