diff --git a/.rubocop.yml b/.rubocop.yml index fca3b19..4b122f8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.4 + TargetRubyVersion: 2.5 Exclude: - _site/**/* - vendor/**/* diff --git a/.travis.yml b/.travis.yml index fe5828b..7ab30fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ script: "./script/cibuild" #environment language: ruby rvm: - - 2.4.2 + - 2.5.1 addons: apt: diff --git a/README.md b/README.md index 32fddad..7b6b860 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,6 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc * `title` - The license full name specified by https://spdx.org/licenses/ * `spdx-id` - Short identifier specified by https://spdx.org/licenses/ -* `source` - The URL to the license source text * `description` - A human-readable description of the license * `how` - Instructions on how to implement the license * `using` - A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url` @@ -98,4 +97,4 @@ The license properties (rules) are stored as a bulleted list within the licenses ## License -The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](https://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](https://opensource.org/licenses/mit-license.php). +The content of this project itself is licensed under the [Creative Commons Attribution 3.0 Unported license](https://creativecommons.org/licenses/by/3.0/), and the underlying source code used to format and display that content is licensed under the [MIT license](LICENSE.md). diff --git a/_data/meta.yml b/_data/meta.yml index a85a46a..2a58872 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -9,10 +9,6 @@ description: Short identifier specified by https://spdx.org/licenses/ required: true -- name: source - description: The URL to the license source text - required: true - - name: description description: A human-readable description of the license required: true diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 42821e8..92c4f25 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -19,7 +19,7 @@ {% if page.source %}
- + Source diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index 3c59b86..62cf60f 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -1,7 +1,6 @@ --- title: Academic Free License v3.0 spdx-id: AFL-3.0 -source: https://opensource.org/licenses/afl-3.0 description: The Academic Free License is a variant of the Open Software License that does not require that the source code of derivative works be disclosed. It contains explicit copyright and patent grants and reserves trademark rights in the author. diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index 4576d04..19929c7 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -3,7 +3,6 @@ title: GNU Affero General Public License v3.0 spdx-id: AGPL-3.0 nickname: GNU AGPLv3 redirect_from: /licenses/agpl/ -source: https://www.gnu.org/licenses/agpl-3.0.txt hidden: false description: Permissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available. diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index cfbc43a..28670e4 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -2,7 +2,6 @@ title: Apache License 2.0 spdx-id: Apache-2.0 redirect_from: /licenses/apache/ -source: https://www.apache.org/licenses/LICENSE-2.0.html featured: true hidden: false diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index 021c056..3e770b8 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -2,7 +2,6 @@ title: Artistic License 2.0 spdx-id: Artistic-2.0 redirect_from: /licenses/artistic/ -source: https://spdx.org/licenses/Artistic-2.0.html description: Heavily favored by the Perl community, the Artistic license requires that modified versions of the software do not prevent users from running the standard version. diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index b082568..de38ef0 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -2,7 +2,6 @@ title: BSD 2-Clause "Simplified" License spdx-id: BSD-2-Clause redirect_from: /licenses/bsd/ -source: https://opensource.org/licenses/BSD-2-Clause hidden: false description: A permissive license that comes in two variants, the BSD 2-Clause and BSD 3-Clause. Both have very minute differences to the MIT license. @@ -10,6 +9,9 @@ description: A permissive license that comes in two variants, the BSD 3-Clause License that explicitly does not grant any patent rights. diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index f8fc45e..edeebc7 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -1,7 +1,6 @@ --- title: BSD 3-Clause "New" or "Revised" License spdx-id: BSD-3-Clause -source: https://opensource.org/licenses/BSD-3-Clause hidden: false description: A permissive license similar to the BSD 2-Clause License, but with a 3rd clause that prohibits others from using the name of the project or its contributors to promote derived products without written consent. @@ -9,6 +8,9 @@ description: A permissive license similar to the compatible license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software. diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt index 654eb76..b79d595 100644 --- a/_licenses/cc0-1.0.txt +++ b/_licenses/cc0-1.0.txt @@ -2,7 +2,6 @@ title: Creative Commons Zero v1.0 Universal spdx-id: CC0-1.0 redirect_from: /licenses/cc0/ -source: https://creativecommons.org/publicdomain/zero/1.0/ description: The Creative Commons CC0 Public Domain Dedication waives copyright interest in a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense. diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index 450e081..63f0590 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -1,7 +1,6 @@ --- title: Educational Community License v2.0 spdx-id: ECL-2.0 -source: https://opensource.org/licenses/ECL-2.0 description: The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license. diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index b8d54dc..82b2eab 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -1,7 +1,6 @@ --- title: Eclipse Public License 1.0 spdx-id: EPL-1.0 -source: https://www.eclipse.org/legal/epl-v10.html description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. diff --git a/_licenses/epl-2.0.txt b/_licenses/epl-2.0.txt index cca6024..3465a79 100644 --- a/_licenses/epl-2.0.txt +++ b/_licenses/epl-2.0.txt @@ -2,7 +2,6 @@ title: Eclipse Public License 2.0 spdx-id: EPL-2.0 redirect_from: /licenses/eclipse/ -source: https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt hidden: false description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index 125afe8..803b647 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -2,7 +2,6 @@ title: European Union Public License 1.1 spdx-id: EUPL-1.1 redirect_from: /licenses/eupl-v1.1/ -source: https://joinup.ec.europa.eu/page/eupl-text-11-12 description: The “European Union Public Licence” (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt index 471ab2d..83f0082 100644 --- a/_licenses/eupl-1.2.txt +++ b/_licenses/eupl-1.2.txt @@ -1,7 +1,6 @@ --- title: European Union Public License 1.2 spdx-id: EUPL-1.2 -source: https://eur-lex.europa.eu/legal-content/TXT/?uri=CELEX%3A32017D0863 description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index b67ffd2..b19cc14 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -3,7 +3,6 @@ title: GNU General Public License v2.0 spdx-id: GPL-2.0 nickname: GNU GPLv2 redirect_from: /licenses/gpl-v2/ -source: https://www.gnu.org/licenses/gpl-2.0.txt hidden: false description: The GNU GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. There are multiple variants of the GNU GPL, each with different requirements. diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index 07cfa30..74e6823 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -3,7 +3,6 @@ title: GNU General Public License v3.0 spdx-id: GPL-3.0 nickname: GNU GPLv3 redirect_from: /licenses/gpl-v3/ -source: https://www.gnu.org/licenses/gpl-3.0.txt featured: true hidden: false diff --git a/_licenses/isc.txt b/_licenses/isc.txt index 3c231d3..c4e6209 100644 --- a/_licenses/isc.txt +++ b/_licenses/isc.txt @@ -1,7 +1,6 @@ --- title: ISC License spdx-id: ISC -source: https://opensource.org/licenses/isc-license description: A permissive license lets people do anything with your code with proper attribution and without warranty. The ISC license is functionally equivalent to the BSD 2-Clause and MIT licenses, removing some language that is no longer necessary. diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index ab12320..1af0e68 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -3,7 +3,6 @@ title: GNU Lesser General Public License v2.1 spdx-id: LGPL-2.1 nickname: GNU LGPLv2.1 redirect_from: /licenses/lgpl-v2.1/ -source: https://www.gnu.org/licenses/lgpl-2.1.txt hidden: false description: Primarily used for software libraries, the GNU LGPL requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction. There are two commonly used versions of the GNU LGPL. diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index fa06f2d..d66bad4 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -3,7 +3,6 @@ title: GNU Lesser General Public License v3.0 spdx-id: LGPL-3.0 nickname: GNU LGPLv3 redirect_from: /licenses/lgpl-v3/ -source: https://www.gnu.org/licenses/lgpl-3.0.txt hidden: false description: Permissions of this copyleft license are conditioned on making available complete source code of licensed works and modifications under the same license or the GNU GPLv3. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work through interfaces provided by the licensed work may be distributed under different terms and without source code for the larger work. diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.txt index fb80b88..2966d68 100644 --- a/_licenses/lppl-1.3c.txt +++ b/_licenses/lppl-1.3c.txt @@ -1,7 +1,6 @@ --- title: LaTeX Project Public License v1.3c spdx-id: LPPL-1.3c -source: https://latex-project.org/lppl/lppl-1-3c.html description: The LaTeX Project Public License (LPPL) is the primary license under which the LaTeX kernel and the base LaTeX packages are distributed. diff --git a/_licenses/mit.txt b/_licenses/mit.txt index 885f55e..b21eb95 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -1,7 +1,6 @@ --- title: MIT License spdx-id: MIT -source: https://opensource.org/licenses/MIT featured: true hidden: false diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index e791870..c63d3f2 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -2,7 +2,6 @@ title: Mozilla Public License 2.0 spdx-id: MPL-2.0 redirect_from: /licenses/mozilla/ -source: https://www.mozilla.org/media/MPL/2.0/index.txt hidden: false description: Permissions of this weak copyleft license are conditioned on making available source code of licensed files and modifications of those files under the same license (or in certain cases, one of the GNU licenses). Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work may be distributed under different terms and without source code for files added in the larger work. diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index 6384c1a..5e7dd1f 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -1,7 +1,6 @@ --- title: Microsoft Public License spdx-id: MS-PL -source: https://opensource.org/licenses/ms-pl description: An open source license with a patent grant. diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index 1a4e80d..e49fa4a 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -1,7 +1,6 @@ --- title: Microsoft Reciprocal License spdx-id: MS-RL -source: https://opensource.org/licenses/ms-rl description: An open source license with a patent grant similar to the Microsoft Public License, with the additional condition that any source code for any derived file be provided under this license. diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt index a5893d5..e384342 100644 --- a/_licenses/ncsa.txt +++ b/_licenses/ncsa.txt @@ -2,7 +2,6 @@ title: University of Illinois/NCSA Open Source License spdx-id: NCSA nickname: UIUC/NCSA -source: https://opensource.org/licenses/NCSA description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the MIT/X11 license and the BSD 3-clause License. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibition of using the names of the authors or the project organization to promote or endorse derived products. diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt index 5930c10..02d0938 100644 --- a/_licenses/ofl-1.1.txt +++ b/_licenses/ofl-1.1.txt @@ -2,7 +2,6 @@ title: SIL Open Font License 1.1 spdx-id: OFL-1.1 redirect_from: /licenses/ofl/ -source: http://scripts.sil.org/OFL_web description: The Open Font License (OFL) is maintained by SIL International. It attempts to be a compromise between the values of the free software and typeface design communities. It is used for almost all open source font projects, including those by Adobe, Google and Mozilla. diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index 03482e5..4205df2 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -1,7 +1,6 @@ --- title: Open Software License 3.0 spdx-id: OSL-3.0 -source: https://opensource.org/licenses/OSL-3.0 description: OSL 3.0 is a copyleft license that does not require reciprocal licensing on linked works. It also provides an express grant of patent rights from contributors to users, with a termination clause triggered if a user files a patent infringement lawsuit. diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index 484f63c..4a76e98 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -1,7 +1,6 @@ --- title: PostgreSQL License spdx-id: PostgreSQL -source: https://opensource.org/licenses/PostgreSQL description: A very short, BSD-style license, used specifically for PostgreSQL. diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 496d16b..2eb20df 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -1,7 +1,6 @@ --- title: The Unlicense spdx-id: Unlicense -source: https://unlicense.org/UNLICENSE hidden: false description: A license with no conditions whatsoever which dedicates works to the public domain. Unlicensed works, modifications, and larger works may be distributed under different terms and without source code. diff --git a/_licenses/upl-1.0.txt b/_licenses/upl-1.0.txt index dbacab4..35afaa4 100644 --- a/_licenses/upl-1.0.txt +++ b/_licenses/upl-1.0.txt @@ -1,7 +1,6 @@ --- title: Universal Permissive License v1.0 spdx-id: UPL-1.0 -source: https://oss.oracle.com/licenses/upl/ 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. diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt index bfbfe72..188d593 100644 --- a/_licenses/wtfpl.txt +++ b/_licenses/wtfpl.txt @@ -1,7 +1,6 @@ --- title: "Do What The F*ck You Want To Public License" spdx-id: WTFPL -source: http://www.wtfpl.net/txt/copying/ description: The easiest license out there. It gives the user permissions to do whatever they want with your code. diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt index dc2e09c..fca4c90 100644 --- a/_licenses/zlib.txt +++ b/_licenses/zlib.txt @@ -1,7 +1,6 @@ --- title: zlib License spdx-id: Zlib -source: https://opensource.org/licenses/Zlib description: A short permissive license, compatible with GPL. Requires altered source versions to be documented as such. diff --git a/index.html b/index.html index 21c5a0f..f3d2477 100644 --- a/index.html +++ b/index.html @@ -72,7 +72,7 @@ permalink: /

  • I don’t want to choose a license.

    - You don’t have to. + Here’s what happens if you don’t.

    • diff --git a/script/bootstrap b/script/bootstrap index b659455..b37867e 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -3,7 +3,7 @@ set -e echo "bundling installin'" -gem install bundler +gem install bundler --version 1.16.2 bundle install echo diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 664cbef..09bf62c 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -26,8 +26,6 @@ describe 'license meta' do 'afl-3.0', 'agpl-3.0', 'artistic-2.0', - 'bsd-2-clause', - 'bsd-3-clause', 'bsd-3-clause-clear', 'bsl-1.0', 'cc0-1.0',