From a03e61a993347cab3a8a7a8b78b93bca8e5d988a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 16 Feb 2018 09:09:15 +0000 Subject: [PATCH 01/12] CONTRIBUTING: note license. This is to be more explicit about the contribution process and license. --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 592b0d5..69b966d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,6 +2,8 @@ We love Pull Requests! Your contributions help make ChooseALicense.com great. +Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE.md). + Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. ## Getting Started From adb35c0c823def75d0a10bfb6f5952fb99ca5ba8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 14 Mar 2018 18:45:10 -0700 Subject: [PATCH 02/12] Rubocop 0.53 doesn't like kernel#open use more specific OpenURI.open_uri instead https://github.com/bbatsov/rubocop/blob/841569b305808e279a814c9823da30e8d1d0649a/manual/cops_security.md#securityopen Not sure this is really a problem for tests, but easiest to just change. --- spec/license_meta_spec.rb | 2 +- spec/spec_helper.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index df2957c..e9067a5 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -54,7 +54,7 @@ describe 'license meta' do example_url = example.values[0] context "the #{example_url} URL" do - let(:content) { open(example_url).read } + let(:content) { OpenURI.open_uri(example_url).read } let(:detected) { Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license } if example_url.start_with?('https://github.com/') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2fb5fd8..1c309b1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -73,7 +73,7 @@ end def spdx_list SpecHelper.spdx ||= begin url = 'https://spdx.org/licenses/licenses.json' - list = JSON.parse(open(url).read)['licenses'] + list = JSON.parse(OpenURI.open_uri(url).read)['licenses'] list.each_with_object({}) do |values, memo| memo[values['licenseId']] = values end @@ -102,7 +102,7 @@ end def fsf_approved_licenses SpecHelper.fsf_approved_licenses ||= begin url = 'https://wking.github.io/fsf-api/licenses-full.json' - object = JSON.parse(open(url).read) + object = JSON.parse(OpenURI.open_uri(url).read) licenses = {} object.each_value do |meta| next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre') @@ -117,7 +117,7 @@ end def od_approved_licenses SpecHelper.od_approved_licenses ||= begin url = 'http://licenses.opendefinition.org/licenses/groups/od.json' - data = open(url).read + data = OpenURI.open_uri(url).read data = JSON.parse(data) licenses = {} data.each do |id, meta| From c89376ae18e010164a63f9d8871ef818ae79cb9a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 28 Mar 2018 09:51:49 -0700 Subject: [PATCH 03/12] Remove obsolete CLA instructions Followup to #573, fixes #576 --- CONTRIBUTING.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 69b966d..3165304 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,8 +45,6 @@ find it in the GitHub repository. Then click the `Edit` button. Make your changes, type in a commit message, and click the `Propose File Change` button. That’s it! -You will be asked to sign the [GitHub Contributor License Agreement](https://cla.github.com/) for this project when you make your first pull request. - For more advanced changes, check out [the bootstrap instructions](https://github.com/github/choosealicense.com#run-it-on-your-machine) in the [project's readme](/README.md). ## Testing From 24fbf6685ddd05682f73bcea3d85477c696a56a2 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 5 Jan 2018 16:18:59 -0800 Subject: [PATCH 04/12] spec_helper: Adjust to new 'licenses' key in the FSF API The old root object has been moved under 'licenses' with wking/fsf-api@8398a357 (pull: Add JSON-LD markup, 2018-01-04, wking/fsf-api#12) for better forward/backward compatibility. Unfortunately, this results in another one-time incompatible change, which this commit accommodates. The protection from future changes (which should be rare) isn't great, because we're still parsing the document as JSON. There is at least one JSON-LD parser for Ruby [1], but I've stuck with vanilla JSON to avoid pullling in an external dependency just for this rather peripheral functionality. [1]: https://github.com/ruby-rdf/json-ld/ --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1c309b1..4275e00 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -104,7 +104,7 @@ def fsf_approved_licenses url = 'https://wking.github.io/fsf-api/licenses-full.json' object = JSON.parse(OpenURI.open_uri(url).read) licenses = {} - object.each_value do |meta| + object['licenses'].each_value do |meta| next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre') meta['identifiers']['spdx'].each do |identifier| licenses[identifier.downcase] = meta['name'] From 3ea34240f10109163b70246d6935ee68655333bd Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Tue, 10 Apr 2018 09:06:28 -0500 Subject: [PATCH 05/12] Adding the Universal Permissive License 1.0. Signed-off-by: Avi Miller --- _licenses/upl-1.0.txt | 65 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 _licenses/upl-1.0.txt diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt new file mode 100644 index 0000000..4e425ec --- /dev/null +++ b/_licenses/upl-1.0.txt @@ -0,0 +1,65 @@ +--- +title: The Universal Permissive License (UPL), Version 1.0 +spdx-id: UPL-1.0 +source: https://oss.oracle.com/licenses/upl/ +featured: true +hidden: false + +description: A permissive, OSI and FSF approved, GPL compatible license, expressly allowing attribution with just a copyright notice and a short form link rather than the full text of the license. Includes an express grant of patent rights. Licensed works and modifications may be distributed under different terms and without source code, and the patent grant may also optionally be expanded to larger works to permit use as a contributor license agreement. + +how: Insert the license or a link to it along with a copyright notice into your source file(s), and/or create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license and your copyright notice into the file. + +note: It is recommended to add a link to the license and copyright notice at the top of each source file, example text can be found at https://oss.oracle.com/licenses/upl/. + +using: + - ODPI: https://github.com/oracle/odpi + - Souffle: https://github.com/souffle-lang/souffle + - Graal: https://github.com/oracle/graal + +permissions: + - commercial-use + - modifications + - distribution + - patent-use + - private-use + +conditions: + - include-copyright + +limitations: + - liability + - warranty + +--- + +Copyright (c) + +The Universal Permissive License (UPL), Version 1.0 + +Subject to the condition set forth below, permission is hereby granted to any person +obtaining a copy of this software, associate documentation and/or data (collectively +the "Software"), free of charge and under any and all copyright rights in the Software, +and any and all patent rights owned or freely licensable by each licensor hereunder +covering either (i) the unmodified Software as contributed to or provided by such +licensor, or (ii) the Larger Works (as defined below), to deal in both + +(a) the Software, and +(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is +included with the Software (each a “Larger Work” to which the Software is contributed +by such licensors), + +without restriction, including without limitation the rights to copy, create derivative +works of, display, perform, and distribute the Software and make, use, sell, offer for +sale, import, export, have made, and have sold the Software and the Larger Work(s), +and to sublicense the foregoing rights on either these or other terms. + +This license is subject to the following condition: +The above copyright notice and either this complete permission notice or at a minimum a +reference to the UPL must 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. \ No newline at end of file From 119bff740ade8a6942b708c2a41c541f6fc0dd62 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Tue, 10 Apr 2018 11:19:49 -0500 Subject: [PATCH 06/12] Updating upl-1.0.txt based on Travis failures. Fixing title attribute first to confirm I understand the failure messages. Signed-off-by: Avi Miller --- _licenses/upl-1.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 4e425ec..56223ea 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -1,5 +1,5 @@ --- -title: The Universal Permissive License (UPL), Version 1.0 +title: Universal Permissive License v1.0 spdx-id: UPL-1.0 source: https://oss.oracle.com/licenses/upl/ featured: true @@ -62,4 +62,4 @@ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PA 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. \ No newline at end of file +DEALINGS IN THE SOFTWARE. From da9fae28865334a47bab4fb5cb396f860b705de8 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Tue, 10 Apr 2018 11:27:26 -0500 Subject: [PATCH 07/12] Fixed word wrap to 78 characters or less. Signed-off-by: Avi Miller --- _licenses/upl-1.0.txt | 46 +++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 56223ea..04fc1a7 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -36,30 +36,34 @@ Copyright (c) The Universal Permissive License (UPL), Version 1.0 -Subject to the condition set forth below, permission is hereby granted to any person -obtaining a copy of this software, associate documentation and/or data (collectively -the "Software"), free of charge and under any and all copyright rights in the Software, -and any and all patent rights owned or freely licensable by each licensor hereunder -covering either (i) the unmodified Software as contributed to or provided by such -licensor, or (ii) the Larger Works (as defined below), to deal in both +Subject to the condition set forth below, permission is hereby granted to any +person obtaining a copy of this software, associate documentation and/or data +(collectively the "Software"), free of charge and under any and all copyright +rights in the Software, and any and all patent rights owned or freely +licensable by each licensor hereunder covering either (i) the unmodified +Software as contributed to or provided by such licensor, or (ii) the Larger +Works (as defined below), to deal in both (a) the Software, and -(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is -included with the Software (each a “Larger Work” to which the Software is contributed -by such licensors), +(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if +one is included with the Software (each a “Larger Work” to which the Software +is contributed by such licensors), -without restriction, including without limitation the rights to copy, create derivative -works of, display, perform, and distribute the Software and make, use, sell, offer for -sale, import, export, have made, and have sold the Software and the Larger Work(s), -and to sublicense the foregoing rights on either these or other terms. +without restriction, including without limitation the rights to copy, create +derivative works of, display, perform, and distribute the Software and make, +use, sell, offer for sale, import, export, have made, and have sold the +Software and the Larger Work(s), and to sublicense the foregoing rights on +either these or other terms. This license is subject to the following condition: -The above copyright notice and either this complete permission notice or at a minimum a -reference to the UPL must be included in all copies or substantial portions of the Software. +The above copyright notice and either this complete permission notice or at +a minimum a reference to the UPL must 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. +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. From 4ccea129e30c24d60eaf0db7d7bbbcf6bb4b6e91 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 10 Apr 2018 10:18:43 -0700 Subject: [PATCH 08/12] use defaults --- _licenses/upl-1.0.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 04fc1a7..753fe5b 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -2,8 +2,6 @@ title: Universal Permissive License v1.0 spdx-id: UPL-1.0 source: https://oss.oracle.com/licenses/upl/ -featured: true -hidden: false description: A permissive, OSI and FSF approved, GPL compatible license, expressly allowing attribution with just a copyright notice and a short form link rather than the full text of the license. Includes an express grant of patent rights. Licensed works and modifications may be distributed under different terms and without source code, and the patent grant may also optionally be expanded to larger works to permit use as a contributor license agreement. From 62437700ddae91786cd5154958eb107d7f825543 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Tue, 10 Apr 2018 13:13:01 -0500 Subject: [PATCH 09/12] Updating the "using" section to list projects that are only licensed under the UPL, instead of being dual licensed. Signed-off-by: Avi Miller --- _licenses/upl-1.0.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 04fc1a7..8fc8dc5 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -12,9 +12,9 @@ how: Insert the license or a link to it along with a copyright notice into your note: It is recommended to add a link to the license and copyright notice at the top of each source file, example text can be found at https://oss.oracle.com/licenses/upl/. using: - - ODPI: https://github.com/oracle/odpi - - Souffle: https://github.com/souffle-lang/souffle - - Graal: https://github.com/oracle/graal + - WebLogic Kubernetes Operator: https://github.com/oracle/weblogic-kubernetes-operator + - Oracle Product Images for Docker: https://github.com/oracle/docker-images + - Oracle Product Boxes for Vagrant: https://github.com/oracle/vagrant-boxes permissions: - commercial-use From 37429ccd9c6b0242206b05cb5be290bb2171ff9f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 10 Apr 2018 14:35:57 -0700 Subject: [PATCH 10/12] examples should link to LICENSE files --- _licenses/upl-1.0.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index 7e9d446..e390804 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -10,9 +10,9 @@ how: Insert the license or a link to it along with a copyright notice into your note: It is recommended to add a link to the license and copyright notice at the top of each source file, example text can be found at https://oss.oracle.com/licenses/upl/. using: - - WebLogic Kubernetes Operator: https://github.com/oracle/weblogic-kubernetes-operator - - Oracle Product Images for Docker: https://github.com/oracle/docker-images - - Oracle Product Boxes for Vagrant: https://github.com/oracle/vagrant-boxes + - WebLogic Kubernetes Operator: https://github.com/oracle/weblogic-kubernetes-operator/blob/master/LICENSE + - Oracle Product Images for Docker: https://github.com/oracle/docker-images/blob/master/LICENSE + - Oracle Product Boxes for Vagrant: https://github.com/oracle/vagrant-boxes/blob/master/LICENSE permissions: - commercial-use @@ -31,9 +31,9 @@ limitations: --- Copyright (c) - + The Universal Permissive License (UPL), Version 1.0 - + Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this software, associate documentation and/or data (collectively the "Software"), free of charge and under any and all copyright @@ -41,27 +41,27 @@ rights in the Software, and any and all patent rights owned or freely licensable by each licensor hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or (ii) the Larger Works (as defined below), to deal in both - + (a) the Software, and (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is included with the Software (each a “Larger Work” to which the Software is contributed by such licensors), - + without restriction, including without limitation the rights to copy, create derivative works of, display, perform, and distribute the Software and make, use, sell, offer for sale, import, export, have made, and have sold the Software and the Larger Work(s), and to sublicense the foregoing rights on either these or other terms. - + This license is subject to the following condition: The above copyright notice and either this complete permission notice or at a minimum a reference to the UPL must be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + +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. +SOFTWARE. From b4db996481de3f265b877edf6c5b6a66c3ad4391 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 12 Apr 2018 11:30:29 -0700 Subject: [PATCH 11/12] UPL-1.0 (c) line use [year] and [fullname] fields --- _licenses/upl-1.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index e390804..eab17b0 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -30,7 +30,7 @@ limitations: --- -Copyright (c) +Copyright (c) [year] [fullname] The Universal Permissive License (UPL), Version 1.0 From 326b883abac7163b2ea3e727b5309273f9dbf312 Mon Sep 17 00:00:00 2001 From: Gram Date: Wed, 18 Apr 2018 16:54:07 +0500 Subject: [PATCH 12/12] Actualize CC-BY licenses names https://creativecommons.org/licenses/by/4.0/legalcode --- _licenses/cc-by-4.0.txt | 2 +- _licenses/cc-by-sa-4.0.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index 35beda5..41b3a2b 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -1,5 +1,5 @@ --- -title: Creative Commons Attribution 4.0 +title: Creative Commons Attribution 4.0 International spdx-id: CC-BY-4.0 source: https://creativecommons.org/licenses/by/4.0/legalcode.txt diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index ec3451d..c098290 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -1,5 +1,5 @@ --- -title: Creative Commons Attribution Share Alike 4.0 +title: Creative Commons Attribution Share Alike 4.0 International spdx-id: CC-BY-SA-4.0 source: https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt