Merge pull request #1301 from presidentbeef/update_license_to_bpul

Update license to Brakeman Public Use License
presidentbeef · Jan 17, 2019 · ef2302f · ef2302f
2 parents e91b901 + f30ac40
commit ef2302f
Show file tree

Hide file tree

Showing 6 changed files with 130 additions and 177 deletions.
diff --git a/CC-LICENSE.md b/CC-LICENSE.md
diff --git a/.github/contributing.md → CONTRIBUTING.md b/.github/contributing.md → CONTRIBUTING.md
@@ -1,7 +1,7 @@
 ## Copyright Assignment
 
 By opening a pull request to https://github.com/presidentbeef/brakeman,
-you agree to assign all rights to the code to Synopsys, Inc.
+you agree to assign all rights to the code to Synopsys, Inc. under the [Brakeman Public Use License](LICENSE.md).
 
 ## Submitting a Pull Request
 

diff --git a/COPYING.md b/COPYING.md
@@ -1,16 +1,5 @@
-Code committed on or after June 15, 2018 is licensed under [Creative Commons Attribution NonCommercial Share Alike 4.0 license](https://creativecommons.org/licenses/by-nc-sa/4.0/) and is owned by Synopsys, Inc.
+Code committed on or after June 15, 2018 is licensed under the [Brakeman Public Use Licese](https://github.com/presidentbeef/brakeman/blob/master/LICENSE.md) and is owned by Synopsys, Inc.
 
 Code committed prior to June 15, 2018 is licensed under the MIT license and is owned by the respective copyright holders.
 
-The code available on https://github.com/presidentbeef/brakeman/ and as packaged on https://rubygems.org/gems/brakeman is distributed under the Creative Commons Attribution NonCommercial Share Alike 4.0 license, sublicensed as necessary under MIT.
-
----
-
-To summarize the license terms:
-
-* Brakeman can be freely used, modified, or distributed for any purpose except as a feature of a commercial product
-* Brakeman may be used to scan any application, even as part of a consulting contract or professional security assessment, regardless of the commercial nature of the application
-* All distributed modifications must be under the same terms as the original code
-* The copyright for contributions made to https://github.com/presidentbeef/brakeman/ will be assigned to Synopsys, Inc.
-
-If you would like to use Brakeman as a feature of a commercial product or online service ("Brakeman-as-a-Service"), please contact [email protected].
+The code available on [GitHub](https://github.com/presidentbeef/brakeman/) and as packaged on [RubyGems](https://rubygems.org/gems/brakeman) is distributed under the [Brakeman Public Use Licese](https://github.com/presidentbeef/brakeman/blob/master/LICENSE.md), sublicensed as necessary under MIT.