update license texts from #489, avoid EPL-1.0 skip

_licenses/afl-3.0.txt

@@ -34,23 +34,25 @@ authorship (the "Original Work") whose owner (the "Licensor") has placed the
 following licensing notice adjacent to the copyright notice for the Original
 Work:
 
-Licensed under the Academic Free License version 3.0
+     Licensed under the Academic Free License version 3.0
 
 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free,
 non-exclusive, sublicensable license, for the duration of the copyright, to do
 the following:
 
-a) to reproduce the Original Work in copies, either alone or as part of a
+     a) to reproduce the Original Work in copies, either alone or as part of a
-collective work;
+     collective work;
-b) to translate, adapt, alter, transform, modify, or arrange the Original
+
-Work, thereby creating derivative works ("Derivative Works") based upon the
+     b) to translate, adapt, alter, transform, modify, or arrange the Original
-Original Work;
+     Work, thereby creating derivative works ("Derivative Works") based upon
-c) to distribute or communicate copies of the Original Work and Derivative
+     the Original Work;
-Works to the public, under any license of your choice that does not contradict
+
-the terms and conditions, including Licensor’s reserved rights and remedies,
+     c) to distribute or communicate copies of the Original Work and
-in this Academic Free License;
+     Derivative Works to the public, under any license of your choice that
-d) to perform the Original Work publicly; and
+     does not contradict the terms and conditions, including Licensor’s
-e) to display the Original Work publicly.
+     reserved rights and remedies, in this Academic Free License;
+     d) to perform the Original Work publicly; and
+     e) to display the Original Work publicly.
 
 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free,
 non-exclusive, sublicensable license, under patent claims owned or controlled
@@ -68,19 +70,19 @@ copy of the Source Code in an information repository reasonably calculated to
 permit inexpensive and convenient access by You for as long as Licensor
 continues to distribute the Original Work.
 
-4) Exclusions From License Grant. Neither the names of Licensor, nor the names
+ 4) Exclusions From License Grant. Neither the names of Licensor, nor the
-of any contributors to the Original Work, nor any of their trademarks or
+ names of any contributors to the Original Work, nor any of their trademarks
-service marks, may be used to endorse or promote products derived from this
+ or service marks, may be used to endorse or promote products derived from
-Original Work without express prior permission of the Licensor. Except as
+ this Original Work without express prior permission of the Licensor. Except
-expressly stated herein, nothing in this License grants any license to
+ as expressly stated herein, nothing in this License grants any license to
-Licensor’s trademarks, copyrights, patents, trade secrets or any other
+ Licensor’s trademarks, copyrights, patents, trade secrets or any other
-intellectual property. No patent license is granted to make, use, sell, offer
+ intellectual property. No patent license is granted to make, use, sell, offer
-for sale, have made, or import embodiments of any patent claims other than the
+ for sale, have made, or import embodiments of any patent claims other than
-licensed claims defined in Section 2. No license is granted to the trademarks
+ the licensed claims defined in Section 2. No license is granted to the
-of Licensor even if such marks are included in the Original Work. Nothing in
+ trademarks of Licensor even if such marks are included in the Original Work.
-this License shall be interpreted to prohibit Licensor from licensing under
+ Nothing in this License shall be interpreted to prohibit Licensor from
-terms different from this License any Original Work that Licensor otherwise
+ licensing under terms different from this License any Original Work that
-would have a right to license.
+ Licensor otherwise would have a right to license.
 
 5) External Deployment. The term "External Deployment" means the use,
 distribution, or communication of the Original Work or Derivative Works in any

_licenses/bsd-3-clause-clear.txt

@@ -34,16 +34,16 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted (subject to the limitations in the disclaimer
 below) provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
+     * Redistributions of source code must retain the above copyright notice,
-list of conditions and the following disclaimer.
+     this list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice,
+     * Redistributions in binary form must reproduce the above copyright
-this list of conditions and the following disclaimer in the documentation
+     notice, this list of conditions and the following disclaimer in the
-and/or other materials provided with the distribution.
+     documentation and/or other materials provided with the distribution.
 
-* Neither the name of [fullname] nor the names of its contributors may be used
+     * Neither the name of [fullname] nor the names of its contributors may be
-to endorse or promote products derived from this software without specific
+     used to endorse or promote products derived from this software without
-prior written permission.
+     specific prior written permission.
 
 NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY
 THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND

_licenses/epl-1.0.txt

@@ -41,21 +41,19 @@ CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 1. DEFINITIONS
 
 "Contribution" means:
+     a) in the case of the initial Contributor, the initial code and
+     documentation distributed under this Agreement, and
+     b) in the case of each subsequent Contributor:
+          i) changes to the Program, and
+          ii) additions to the Program;
 
-a) in the case of the initial Contributor, the initial code and documentation
+where such changes and/or additions to the Program originate from and are
-   distributed under this Agreement, and
+distributed by that particular Contributor. A Contribution 'originates' from a
-b) in the case of each subsequent Contributor:
+Contributor if it was added to the Program by such Contributor itself or
-    i) changes to the Program, and
+anyone acting on such Contributor's behalf. Contributions do not include
-   ii) additions to the Program;
+additions to the Program which: (i) are separate modules of software
-
+distributed in conjunction with the Program under their own license agreement,
-   where such changes and/or additions to the Program originate from and are
+and (ii) are not derivative works of the Program.
-   distributed by that particular Contributor. A Contribution 'originates'
-   from a Contributor if it was added to the Program by such Contributor
-   itself or anyone acting on such Contributor's behalf. Contributions do not
-   include additions to the Program which: (i) are separate modules of
-   software distributed in conjunction with the Program under their own
-   license agreement, and (ii) are not derivative works of the Program.
-
 "Contributor" means any person or entity that distributes the Program.
 
 "Licensed Patents" mean patent claims licensable by a Contributor which are
@@ -69,12 +67,14 @@ Agreement.
 including all Contributors.
 
 2. GRANT OF RIGHTS
-  a) Subject to the terms of this Agreement, each Contributor hereby grants
+
+     a) Subject to the terms of this Agreement, each Contributor hereby grants
      Recipient a non-exclusive, worldwide, royalty-free copyright license to
      reproduce, prepare derivative works of, publicly display, publicly
      perform, distribute and sublicense the Contribution of such Contributor,
      if any, and such derivative works, in source code and object code form.
-  b) Subject to the terms of this Agreement, each Contributor hereby grants
+
+     b) Subject to the terms of this Agreement, each Contributor hereby grants
      Recipient a non-exclusive, worldwide, royalty-free patent license under
      Licensed Patents to make, use, sell, offer to sell, import and otherwise
      transfer the Contribution of such Contributor, if any, in source code and
@@ -84,56 +84,60 @@ including all Contributors.
      combination to be covered by the Licensed Patents. The patent license
      shall not apply to any other combinations which include the Contribution.
      No hardware per se is licensed hereunder.
-  c) Recipient understands that although each Contributor grants the licenses
+
-     to its Contributions set forth herein, no assurances are provided by any
+     c) Recipient understands that although each Contributor grants the
-     Contributor that the Program does not infringe the patent or other
+     licenses to its Contributions set forth herein, no assurances are
-     intellectual property rights of any other entity. Each Contributor
+     provided by any Contributor that the Program does not infringe the patent
-     disclaims any liability to Recipient for claims brought by any other
+     or other intellectual property rights of any other entity. Each
-     entity based on infringement of intellectual property rights or
+     Contributor disclaims any liability to Recipient for claims brought by
+     any other entity based on infringement of intellectual property rights or
      otherwise. As a condition to exercising the rights and licenses granted
      hereunder, each Recipient hereby assumes sole responsibility to secure
      any other intellectual property rights needed, if any. For example, if a
      third party patent license is required to allow Recipient to distribute
      the Program, it is Recipient's responsibility to acquire that license
      before distributing the Program.
-  d) Each Contributor represents that to its knowledge it has sufficient
+
+     d) Each Contributor represents that to its knowledge it has sufficient
      copyright rights in its Contribution, if any, to grant the copyright
      license set forth in this Agreement.
 
 3. REQUIREMENTS
-
 A Contributor may choose to distribute the Program in object code form under
 its own license agreement, provided that:
 
-  a) it complies with the terms and conditions of this Agreement; and
+     a) it complies with the terms and conditions of this Agreement; and
-  b) its license agreement:
+
-      i) effectively disclaims on behalf of all Contributors all warranties
+     b) its license agreement:
-         and conditions, express and implied, including warranties or
+          i) effectively disclaims on behalf of all Contributors all
-         conditions of title and non-infringement, and implied warranties or
+          warranties and conditions, express and implied, including warranties
-         conditions of merchantability and fitness for a particular purpose;
+          or conditions of title and non-infringement, and implied warranties
-     ii) effectively excludes on behalf of all Contributors all liability for
+          or conditions of merchantability and fitness for a particular
-         damages, including direct, indirect, special, incidental and
+          purpose;
-         consequential damages, such as lost profits;
+          ii) effectively excludes on behalf of all Contributors all liability
-    iii) states that any provisions which differ from this Agreement are
+          for damages, including direct, indirect, special, incidental and
-         offered by that Contributor alone and not by any other party; and
+          consequential damages, such as lost profits;
-     iv) states that source code for the Program is available from such
+          iii) states that any provisions which differ from this Agreement are
-         Contributor, and informs licensees how to obtain it in a reasonable
+          offered by that Contributor alone and not by any other party; and
-         manner on or through a medium customarily used for software exchange.
+          iv) states that source code for the Program is available from such
+          Contributor, and informs licensees how to obtain it in a reasonable
+          manner on or through a medium customarily used for software
+          exchange.
 
 When the Program is made available in source code form:
 
-  a) it must be made available under this Agreement; and
+     a) it must be made available under this Agreement; and
-  b) a copy of this Agreement must be included with each copy of the Program.
+
-     Contributors may not remove or alter any copyright notices contained
+     b) a copy of this Agreement must be included with each copy of the
-     within the Program.
+     Program.
+Contributors may not remove or alter any copyright notices contained within
+the Program.
 
 Each Contributor must identify itself as the originator of its Contribution,
-if
+if any, in a manner that reasonably allows subsequent Recipients to identify
-any, in a manner that reasonably allows subsequent Recipients to identify the
+the originator of the Contribution.
-originator of the Contribution.
 
 4. COMMERCIAL DISTRIBUTION
-
 Commercial distributors of software may accept certain responsibilities with
 respect to end users, business partners and the like. While this license is
 intended to facilitate the commercial use of the Program, the Contributor who
@@ -148,12 +152,11 @@ Contributor to the extent caused by the acts or omissions of such Commercial
 Contributor in connection with its distribution of the Program in a commercial
 product offering. The obligations in this section do not apply to any claims
 or Losses relating to any actual or alleged intellectual property
-infringement. In order to qualify, an Indemnified Contributor must:
+infringement. In order to qualify, an Indemnified Contributor must: a)
-a) promptly notify the Commercial Contributor in writing of such claim, and
+promptly notify the Commercial Contributor in writing of such claim, and b)
-b) allow the Commercial Contributor to control, and cooperate with the
+allow the Commercial Contributor to control, and cooperate with the Commercial
-Commercial Contributor in, the defense and any related settlement
+Contributor in, the defense and any related settlement negotiations. The
-negotiations. The Indemnified Contributor may participate in any such claim at
+Indemnified Contributor may participate in any such claim at its own expense.
-its own expense.
 
 For example, a Contributor might include the Program in a commercial product
 offering, Product X. That Contributor is then a Commercial Contributor. If
@@ -166,7 +169,6 @@ court requires any other Contributor to pay any damages as a result, the
 Commercial Contributor must pay those damages.
 
 5. NO WARRANTY
-
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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,
@@ -179,7 +181,6 @@ or loss of data, programs or equipment, and unavailability or interruption of
 operations.
 
 6. DISCLAIMER OF LIABILITY
-
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
 CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
@@ -233,5 +234,5 @@ Program not expressly granted under this Agreement are reserved.
 This Agreement is governed by the laws of the State of New York and the
 intellectual property laws of the United States of America. No party to this
 Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
+after the cause of action arose. Each party waives its rights to a jury trial
-any resulting litigation.
+in any resulting litigation.

_licenses/ms-pl.txt

@@ -31,7 +31,7 @@ This license governs use of the accompanying software. If you use the
 software, you accept this license. If you do not accept the license, do not
 use the software.
 
-1. Definitions
+1.  Definitions
 The terms "reproduce," "reproduction," "derivative works," and "distribution"
 have the same meaning here as under U.S. copyright law. A "contribution" is
 the original software, or any additions or changes to the software. A
@@ -39,41 +39,41 @@ the original software, or any additions or changes to the software. A
 license. "Licensed patents" are a contributor's patent claims that read
 directly on its contribution.
 
-2. Grant of Rights
+2.  Grant of Rights
-(A) Copyright Grant- Subject to the terms of this license, including the
+     (A) Copyright Grant- Subject to the terms of this license, including the
-license conditions and limitations in section 3, each contributor grants you a
+     license conditions and limitations in section 3, each contributor grants
-non-exclusive, worldwide, royalty-free copyright license to reproduce its
+     you a non-exclusive, worldwide, royalty-free copyright license to
-contribution, prepare derivative works of its contribution, and distribute its
+     reproduce its contribution, prepare derivative works of its contribution,
-contribution or any derivative works that you create.
+     and distribute its contribution or any derivative works that you create.
 
-(B) Patent Grant- Subject to the terms of this license, including the license
+     (B) Patent Grant- Subject to the terms of this license, including the
-conditions and limitations in section 3, each contributor grants you a
+     license conditions and limitations in section 3, each contributor grants
-non-exclusive, worldwide, royalty-free license under its licensed patents to
+     you a non-exclusive, worldwide, royalty-free license under its licensed
-make, have made, use, sell, offer for sale, import, and/or otherwise dispose
+     patents to make, have made, use, sell, offer for sale, import, and/or
-of its contribution in the software or derivative works of the contribution in
+     otherwise dispose of its contribution in the software or derivative works
-the software.
+     of the contribution in the software.
 
-3. Conditions and Limitations
+3.  Conditions and Limitations
-(A) No Trademark License- This license does not grant you rights to use any
+     (A) No Trademark License- This license does not grant you rights to use
-contributors' name, logo, or trademarks.
+     any contributors' name, logo, or trademarks.
 
-(B) If you bring a patent claim against any contributor over patents that you
+     (B) If you bring a patent claim against any contributor over patents that
-claim are infringed by the software, your patent license from such contributor
+     you claim are infringed by the software, your patent license from such
-to the software ends automatically.
+     contributor to the software ends automatically.
 
-(C) If you distribute any portion of the software, you must retain all
+     (C) If you distribute any portion of the software, you must retain all
-copyright, patent, trademark, and attribution notices that are present in the
+     copyright, patent, trademark, and attribution notices that are present in
-software.
+     the software.
 
-(D) If you distribute any portion of the software in source code form, you may
+     (D) If you distribute any portion of the software in source code form,
-do so only under this license by including a complete copy of this license
+     you may do so only under this license by including a complete copy of
-with your distribution. If you distribute any portion of the software in
+     this license with your distribution. If you distribute any portion of the
-compiled or object code form, you may only do so under a license that complies
+     software in compiled or object code form, you may only do so under a
-with this license.
+     license that complies with this license.
 
-(E) The software is licensed "as-is." You bear the risk of using it. The
+     (E) The software is licensed "as-is." You bear the risk of using it. The
-contributors give no express warranties, guarantees, or conditions. You may
+     contributors give no express warranties, guarantees, or conditions. You
-have additional consumer rights under your local laws which this license
+     may have additional consumer rights under your local laws which this
-cannot change. To the extent permitted under your local laws, the contributors
+     license cannot change. To the extent permitted under your local laws, the
-exclude the implied warranties of merchantability, fitness for a particular
+     contributors exclude the implied warranties of merchantability, fitness
-purpose and non-infringement.
+     for a particular purpose and non-infringement.

_licenses/ms-rl.txt

@@ -33,7 +33,7 @@ This license governs use of the accompanying software. If you use the
 software, you accept this license. If you do not accept the license, do not
 use the software.
 
-1. Definitions
+1.  Definitions
 The terms "reproduce," "reproduction," "derivative works," and "distribution"
 have the same meaning here as under U.S. copyright law.
 
@@ -46,47 +46,48 @@ license.
 "Licensed patents" are a contributor's patent claims that read directly on its
 contribution.
 
-2. Grant of Rights
+2.  Grant of Rights
-(A) Copyright Grant- Subject to the terms of this license, including the
+     (A) Copyright Grant- Subject to the terms of this license, including the
-license conditions and limitations in section 3, each contributor grants you a
+     license conditions and limitations in section 3, each contributor grants
-non-exclusive, worldwide, royalty-free copyright license to reproduce its
+     you a non-exclusive, worldwide, royalty-free copyright license to
-contribution, prepare derivative works of its contribution, and distribute its
+     reproduce its contribution, prepare derivative works of its contribution,
-contribution or any derivative works that you create.
+     and distribute its contribution or any derivative works that you create.
 
-(B) Patent Grant- Subject to the terms of this license, including the license
+     (B) Patent Grant- Subject to the terms of this license, including the
-conditions and limitations in section 3, each contributor grants you a
+     license conditions and limitations in section 3, each contributor grants
-non-exclusive, worldwide, royalty-free license under its licensed patents to
+     you a non-exclusive, worldwide, royalty-free license under its licensed
-make, have made, use, sell, offer for sale, import, and/or otherwise dispose
+     patents to make, have made, use, sell, offer for sale, import, and/or
-of its contribution in the software or derivative works of the contribution in
+     otherwise dispose of its contribution in the software or derivative works
-the software.
+     of the contribution in the software.
 
-3. Conditions and Limitations
+3.  Conditions and Limitations
-(A) Reciprocal Grants- For any file you distribute that contains code from the
+     (A) Reciprocal Grants- For any file you distribute that contains code
-software (in source code or binary format), you must provide recipients the
+     from the software (in source code or binary format), you must provide
-source code to that file along with a copy of this license, which license will
+     recipients the source code to that file along with a copy of this
-govern that file. You may license other files that are entirely your own work
+     license, which license will govern that file. You may license other files
-and do not contain code from the software under any terms you choose.
+     that are entirely your own work and do not contain code from the software
+     under any terms you choose.
 
-(B) No Trademark License- This license does not grant you rights to use any
+     (B) No Trademark License- This license does not grant you rights to use
-contributors' name, logo, or trademarks.
+     any contributors' name, logo, or trademarks.
 
-(C) If you bring a patent claim against any contributor over patents that you
+     (C) If you bring a patent claim against any contributor over patents that
-claim are infringed by the software, your patent license from such contributor
+     you claim are infringed by the software, your patent license from such
-to the software ends automatically.
+     contributor to the software ends automatically.
 
-(D) If you distribute any portion of the software, you must retain all
+     (D) If you distribute any portion of the software, you must retain all
-copyright, patent, trademark, and attribution notices that are present in the
+     copyright, patent, trademark, and attribution notices that are present in
-software.
+     the software.
 
-(E) If you distribute any portion of the software in source code form, you may
+     (E) If you distribute any portion of the software in source code form,
-do so only under this license by including a complete copy of this license
+     you may do so only under this license by including a complete copy of
-with your distribution. If you distribute any portion of the software in
+     this license with your distribution. If you distribute any portion of the
-compiled or object code form, you may only do so under a license that complies
+     software in compiled or object code form, you may only do so under a
-with this license.
+     license that complies with this license.
 
-(F) The software is licensed "as-is." You bear the risk of using it. The
+     (F) The software is licensed "as-is." You bear the risk of using it. The
-contributors give no express warranties, guarantees, or conditions. You may
+     contributors give no express warranties, guarantees, or conditions. You
-have additional consumer rights under your local laws which this license
+     may have additional consumer rights under your local laws which this
-cannot change. To the extent permitted under your local laws, the contributors
+     license cannot change. To the extent permitted under your local laws, the
-exclude the implied warranties of merchantability, fitness for a particular
+     contributors exclude the implied warranties of merchantability, fitness
-purpose and non-infringement.
+     for a particular purpose and non-infringement.

spec/license_wrap_spec.rb

@@ -18,7 +18,6 @@ describe 'word wrapping' do
           end
         end
         msg = "Longest line is #{max_line_length} characters: #{max_line}"
-        skip msg if max_line_length > 78 && max_line_length < 81
         expect(max_line_length).to be <= 78, msg
       end
     end