diff options
50 files changed, 1360 insertions, 520 deletions
diff --git a/.gitlab/deb.yml b/.gitlab/deb.yml index 7bb8244..f4f3bfe 100644 --- a/.gitlab/deb.yml +++ b/.gitlab/deb.yml @@ -4,7 +4,6 @@ script: - bin/omnibus setup - bin/omnibus build $OMNIBUS_PROJECT - allow_failure: true artifacts: paths: - pkg/ @@ -28,7 +27,6 @@ gem: extends: .deb variables: OMNIBUS_PROJECT: license_management - allow_failure: false golang-1-14: extends: .deb @@ -59,7 +57,6 @@ mono-6: variables: OMNIBUS_PROJECT: mono MONO_VERSION: '6.8.0.123' - allow_failure: false nodejs-10: extends: .deb @@ -78,7 +75,6 @@ php-7: variables: OMNIBUS_PROJECT: php PHP_VERSION: '7.4.8' - allow_failure: false python-2-7: extends: .deb @@ -205,4 +201,3 @@ rust-1-45: variables: OMNIBUS_PROJECT: rust RUST_VERSION: '1.45.0' - allow_failure: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 37274ac..70cae4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # GitLab License management changelog +## v3.23.0 + +- Upgrade [LicenseFinder](https://github.com/pivotal/LicenseFinder/) to `6.8.1` (!209) +- Update SPDX catalogue to version `3.10` (!209) + ## v3.22.2 - Update default PHP to `7.4.8` (!208) diff --git a/Gemfile.lock b/Gemfile.lock index cf65bcd..908e411 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,8 +8,8 @@ GIT PATH remote: . specs: - license-management (3.22.2) - license_finder (~> 6.6.0) + license-management (3.23.0) + license_finder (~> 6.7) GEM remote: https://rubygems.org/ @@ -65,7 +65,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) libyajl2 (1.2.0) - license_finder (6.6.2) + license_finder (6.8.1) bundler rubyzip (>= 1, < 3) thor (~> 1.0.1) diff --git a/config/scripts/license_management/preinst b/config/scripts/license_management/preinst deleted file mode 100755 index dcef0c4..0000000 --- a/config/scripts/license_management/preinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo "You're about to install license_management!" diff --git a/config/scripts/license_management/prerm b/config/scripts/license_management/prerm deleted file mode 100755 index ef80795..0000000 --- a/config/scripts/license_management/prerm +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -PROGNAME=$(basename "$0") - -error_exit() -{ - echo "${PROGNAME}: ${1:-"Unknown Error"}" 1>&2 - exit 1 -} - -exit 0 diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index 5505daf..fb91980 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.22.2' + VERSION = '3.23.0' end end diff --git a/license-management.gemspec b/license-management.gemspec index 358dd0d..a58c5ea 100644 --- a/license-management.gemspec +++ b/license-management.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_dependency 'license_finder', '~> 6.6.0' + spec.add_dependency 'license_finder', '~> 6.7' spec.add_development_dependency 'byebug', '~> 11.1' spec.add_development_dependency 'gitlab-styles', '~> 3.1' spec.add_development_dependency 'json-schema', '~> 2.8' @@ -9,7 +9,7 @@ set -e export ASDF_JAVA_VERSION="${ASDF_JAVA_VERSION:-}" export ASDF_PYTHON_VERSION="${ASDF_PYTHON_VERSION:-}" export CI_API_V4_URL="${CI_API_V4_URL:-https://gitlab.com/api/v4}" -export CI_DEBUG_TRACE=${CI_DEBUG_TRACE:='false'} +export DEBIAN_FRONTEND=noninteractive export DOTNET_CLI_TELEMETRY_OPTOUT=1 export GO111MODULE=on export GOPATH=/opt/gitlab/.local @@ -31,26 +31,9 @@ export RUBY_HEAP_FREE_MIN=100000 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1 export RUBY_HEAP_SLOTS_INCREMENT=400000 -[[ $CI_DEBUG_TRACE == 'true' ]] && echo "$@" - project_dir="${CI_PROJECT_DIR:-${@: -1}}" [[ -d $project_dir ]] && cd "$project_dir" -function debug_env() { - pwd - ls -alh - env | sort - asdf current - - ruby -v - gem --version - bundle --version - bundle config - - python --version - pip --version -} - function scan_project() { echo license_management report "$@" # shellcheck disable=SC2068 @@ -108,8 +91,6 @@ echo -e "section_start:$(date +%s):prepare_project\r\e[0KPrepare" prepare_project echo -e "section_end:$(date +%s):prepare_project\r\e[0K" -[[ $CI_DEBUG_TRACE == 'true' ]] && debug_env - scan_project "$PREPARE" \ --format=json \ --save="${LM_REPORT_FILE}" \ diff --git a/spdx-licenses.json b/spdx-licenses.json index b2566f1..15a3e31 100644 --- a/spdx-licenses.json +++ b/spdx-licenses.json @@ -1,11 +1,11 @@ { - "licenseListVersion": "3.9", + "licenseListVersion": "3.10", "licenses": [ { "reference": "./0BSD.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/0BSD.json", - "referenceNumber": "239", + "referenceNumber": "250", "name": "BSD Zero Clause License", "licenseId": "0BSD", "seeAlso": [ @@ -17,7 +17,7 @@ "reference": "./AAL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/AAL.json", - "referenceNumber": "60", + "referenceNumber": "63", "name": "Attribution Assurance License", "licenseId": "AAL", "seeAlso": [ @@ -29,7 +29,7 @@ "reference": "./ADSL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/ADSL.json", - "referenceNumber": "217", + "referenceNumber": "227", "name": "Amazon Digital Services License", "licenseId": "ADSL", "seeAlso": [ @@ -42,7 +42,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/AFL-1.1.json", - "referenceNumber": "28", + "referenceNumber": "29", "name": "Academic Free License v1.1", "licenseId": "AFL-1.1", "seeAlso": [ @@ -56,7 +56,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/AFL-1.2.json", - "referenceNumber": "222", + "referenceNumber": "232", "name": "Academic Free License v1.2", "licenseId": "AFL-1.2", "seeAlso": [ @@ -70,7 +70,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/AFL-2.0.json", - "referenceNumber": "341", + "referenceNumber": "358", "name": "Academic Free License v2.0", "licenseId": "AFL-2.0", "seeAlso": [ @@ -83,7 +83,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/AFL-2.1.json", - "referenceNumber": "249", + "referenceNumber": "261", "name": "Academic Free License v2.1", "licenseId": "AFL-2.1", "seeAlso": [ @@ -96,7 +96,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/AFL-3.0.json", - "referenceNumber": "361", + "referenceNumber": "380", "name": "Academic Free License v3.0", "licenseId": "AFL-3.0", "seeAlso": [ @@ -110,7 +110,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/AGPL-1.0.json", - "referenceNumber": "175", + "referenceNumber": "180", "name": "Affero General Public License v1.0", "licenseId": "AGPL-1.0", "seeAlso": [ @@ -122,7 +122,7 @@ "reference": "./AGPL-1.0-only.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/AGPL-1.0-only.json", - "referenceNumber": "71", + "referenceNumber": "74", "name": "Affero General Public License v1.0 only", "licenseId": "AGPL-1.0-only", "seeAlso": [ @@ -134,7 +134,7 @@ "reference": "./AGPL-1.0-or-later.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/AGPL-1.0-or-later.json", - "referenceNumber": "168", + "referenceNumber": "173", "name": "Affero General Public License v1.0 or later", "licenseId": "AGPL-1.0-or-later", "seeAlso": [ @@ -147,7 +147,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/AGPL-3.0.json", - "referenceNumber": "148", + "referenceNumber": "152", "name": "GNU Affero General Public License v3.0", "licenseId": "AGPL-3.0", "seeAlso": [ @@ -161,7 +161,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/AGPL-3.0-only.json", - "referenceNumber": "298", + "referenceNumber": "312", "name": "GNU Affero General Public License v3.0 only", "licenseId": "AGPL-3.0-only", "seeAlso": [ @@ -175,7 +175,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/AGPL-3.0-or-later.json", - "referenceNumber": "160", + "referenceNumber": "164", "name": "GNU Affero General Public License v3.0 or later", "licenseId": "AGPL-3.0-or-later", "seeAlso": [ @@ -188,7 +188,7 @@ "reference": "./AMDPLPA.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/AMDPLPA.json", - "referenceNumber": "133", + "referenceNumber": "137", "name": "AMD\u0027s plpa_map.c License", "licenseId": "AMDPLPA", "seeAlso": [ @@ -200,7 +200,7 @@ "reference": "./AML.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/AML.json", - "referenceNumber": "157", + "referenceNumber": "161", "name": "Apple MIT License", "licenseId": "AML", "seeAlso": [ @@ -212,7 +212,7 @@ "reference": "./AMPAS.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/AMPAS.json", - "referenceNumber": "136", + "referenceNumber": "140", "name": "Academy of Motion Picture Arts and Sciences BSD", "licenseId": "AMPAS", "seeAlso": [ @@ -224,7 +224,7 @@ "reference": "./ANTLR-PD.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/ANTLR-PD.json", - "referenceNumber": "44", + "referenceNumber": "46", "name": "ANTLR Software Rights Notice", "licenseId": "ANTLR-PD", "seeAlso": [ @@ -236,7 +236,7 @@ "reference": "./APAFML.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/APAFML.json", - "referenceNumber": "248", + "referenceNumber": "260", "name": "Adobe Postscript AFM License", "licenseId": "APAFML", "seeAlso": [ @@ -248,7 +248,7 @@ "reference": "./APL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/APL-1.0.json", - "referenceNumber": "278", + "referenceNumber": "290", "name": "Adaptive Public License 1.0", "licenseId": "APL-1.0", "seeAlso": [ @@ -260,7 +260,7 @@ "reference": "./APSL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/APSL-1.0.json", - "referenceNumber": "387", + "referenceNumber": "406", "name": "Apple Public Source License 1.0", "licenseId": "APSL-1.0", "seeAlso": [ @@ -272,7 +272,7 @@ "reference": "./APSL-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/APSL-1.1.json", - "referenceNumber": "338", + "referenceNumber": "355", "name": "Apple Public Source License 1.1", "licenseId": "APSL-1.1", "seeAlso": [ @@ -284,7 +284,7 @@ "reference": "./APSL-1.2.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/APSL-1.2.json", - "referenceNumber": "201", + "referenceNumber": "211", "name": "Apple Public Source License 1.2", "licenseId": "APSL-1.2", "seeAlso": [ @@ -297,7 +297,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/APSL-2.0.json", - "referenceNumber": "141", + "referenceNumber": "145", "name": "Apple Public Source License 2.0", "licenseId": "APSL-2.0", "seeAlso": [ @@ -309,7 +309,7 @@ "reference": "./Abstyles.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Abstyles.json", - "referenceNumber": "75", + "referenceNumber": "78", "name": "Abstyles License", "licenseId": "Abstyles", "seeAlso": [ @@ -321,7 +321,7 @@ "reference": "./Adobe-2006.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Adobe-2006.json", - "referenceNumber": "310", + "referenceNumber": "327", "name": "Adobe Systems Incorporated Source Code License Agreement", "licenseId": "Adobe-2006", "seeAlso": [ @@ -333,7 +333,7 @@ "reference": "./Adobe-Glyph.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Adobe-Glyph.json", - "referenceNumber": "343", + "referenceNumber": "360", "name": "Adobe Glyph List License", "licenseId": "Adobe-Glyph", "seeAlso": [ @@ -345,7 +345,7 @@ "reference": "./Afmparse.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Afmparse.json", - "referenceNumber": "332", + "referenceNumber": "349", "name": "Afmparse License", "licenseId": "Afmparse", "seeAlso": [ @@ -357,7 +357,7 @@ "reference": "./Aladdin.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Aladdin.json", - "referenceNumber": "315", + "referenceNumber": "332", "name": "Aladdin Free Public License", "licenseId": "Aladdin", "seeAlso": [ @@ -370,7 +370,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Apache-1.0.json", - "referenceNumber": "32", + "referenceNumber": "33", "name": "Apache License 1.0", "licenseId": "Apache-1.0", "seeAlso": [ @@ -383,7 +383,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Apache-1.1.json", - "referenceNumber": "274", + "referenceNumber": "286", "name": "Apache License 1.1", "licenseId": "Apache-1.1", "seeAlso": [ @@ -397,7 +397,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Apache-2.0.json", - "referenceNumber": "366", + "referenceNumber": "385", "name": "Apache License 2.0", "licenseId": "Apache-2.0", "seeAlso": [ @@ -410,7 +410,7 @@ "reference": "./Artistic-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Artistic-1.0.json", - "referenceNumber": "273", + "referenceNumber": "285", "name": "Artistic License 1.0", "licenseId": "Artistic-1.0", "seeAlso": [ @@ -422,7 +422,7 @@ "reference": "./Artistic-1.0-Perl.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Artistic-1.0-Perl.json", - "referenceNumber": "306", + "referenceNumber": "322", "name": "Artistic License 1.0 (Perl)", "licenseId": "Artistic-1.0-Perl", "seeAlso": [ @@ -434,7 +434,7 @@ "reference": "./Artistic-1.0-cl8.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Artistic-1.0-cl8.json", - "referenceNumber": "229", + "referenceNumber": "240", "name": "Artistic License 1.0 w/clause 8", "licenseId": "Artistic-1.0-cl8", "seeAlso": [ @@ -447,7 +447,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Artistic-2.0.json", - "referenceNumber": "78", + "referenceNumber": "81", "name": "Artistic License 2.0", "licenseId": "Artistic-2.0", "seeAlso": [ @@ -460,7 +460,7 @@ "reference": "./BSD-1-Clause.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-1-Clause.json", - "referenceNumber": "389", + "referenceNumber": "408", "name": "BSD 1-Clause License", "licenseId": "BSD-1-Clause", "seeAlso": [ @@ -472,7 +472,7 @@ "reference": "./BSD-2-Clause.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-2-Clause.json", - "referenceNumber": "307", + "referenceNumber": "323", "name": "BSD 2-Clause \"Simplified\" License", "licenseId": "BSD-2-Clause", "seeAlso": [ @@ -482,10 +482,10 @@ }, { "reference": "./BSD-2-Clause-FreeBSD.html", - "isDeprecatedLicenseId": false, + "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/BSD-2-Clause-FreeBSD.json", - "referenceNumber": "281", + "referenceNumber": "294", "name": "BSD 2-Clause FreeBSD License", "licenseId": "BSD-2-Clause-FreeBSD", "seeAlso": [ @@ -497,7 +497,7 @@ "reference": "./BSD-2-Clause-NetBSD.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/BSD-2-Clause-NetBSD.json", - "referenceNumber": "186", + "referenceNumber": "193", "name": "BSD 2-Clause NetBSD License", "licenseId": "BSD-2-Clause-NetBSD", "seeAlso": [ @@ -509,7 +509,7 @@ "reference": "./BSD-2-Clause-Patent.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-2-Clause-Patent.json", - "referenceNumber": "362", + "referenceNumber": "381", "name": "BSD-2-Clause Plus Patent License", "licenseId": "BSD-2-Clause-Patent", "seeAlso": [ @@ -518,11 +518,25 @@ "isOsiApproved": true }, { + "reference": "./BSD-2-Clause-Views.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/BSD-2-Clause-Views.json", + "referenceNumber": "291", + "name": "BSD 2-Clause with views sentence", + "licenseId": "BSD-2-Clause-Views", + "seeAlso": [ + "http://www.freebsd.org/copyright/freebsd-license.html", + "https://people.freebsd.org/~ivoras/wine/patch-wine-nvidia.sh", + "https://github.com/protegeproject/protege/blob/master/license.txt" + ], + "isOsiApproved": false + }, + { "reference": "./BSD-3-Clause.html", "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/BSD-3-Clause.json", - "referenceNumber": "202", + "referenceNumber": "212", "name": "BSD 3-Clause \"New\" or \"Revised\" License", "licenseId": "BSD-3-Clause", "seeAlso": [ @@ -534,7 +548,7 @@ "reference": "./BSD-3-Clause-Attribution.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-3-Clause-Attribution.json", - "referenceNumber": "39", + "referenceNumber": "41", "name": "BSD with attribution", "licenseId": "BSD-3-Clause-Attribution", "seeAlso": [ @@ -547,7 +561,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/BSD-3-Clause-Clear.json", - "referenceNumber": "88", + "referenceNumber": "92", "name": "BSD 3-Clause Clear License", "licenseId": "BSD-3-Clause-Clear", "seeAlso": [ @@ -559,7 +573,7 @@ "reference": "./BSD-3-Clause-LBNL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-3-Clause-LBNL.json", - "referenceNumber": "147", + "referenceNumber": "151", "name": "Lawrence Berkeley National Labs BSD variant license", "licenseId": "BSD-3-Clause-LBNL", "seeAlso": [ @@ -571,7 +585,7 @@ "reference": "./BSD-3-Clause-No-Nuclear-License.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-3-Clause-No-Nuclear-License.json", - "referenceNumber": "62", + "referenceNumber": "65", "name": "BSD 3-Clause No Nuclear License", "licenseId": "BSD-3-Clause-No-Nuclear-License", "seeAlso": [ @@ -583,7 +597,7 @@ "reference": "./BSD-3-Clause-No-Nuclear-License-2014.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-3-Clause-No-Nuclear-License-2014.json", - "referenceNumber": "342", + "referenceNumber": "359", "name": "BSD 3-Clause No Nuclear License 2014", "licenseId": "BSD-3-Clause-No-Nuclear-License-2014", "seeAlso": [ @@ -595,7 +609,7 @@ "reference": "./BSD-3-Clause-No-Nuclear-Warranty.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-3-Clause-No-Nuclear-Warranty.json", - "referenceNumber": "117", + "referenceNumber": "121", "name": "BSD 3-Clause No Nuclear Warranty", "licenseId": "BSD-3-Clause-No-Nuclear-Warranty", "seeAlso": [ @@ -607,7 +621,7 @@ "reference": "./BSD-3-Clause-Open-MPI.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-3-Clause-Open-MPI.json", - "referenceNumber": "214", + "referenceNumber": "224", "name": "BSD 3-Clause Open MPI variant", "licenseId": "BSD-3-Clause-Open-MPI", "seeAlso": [ @@ -621,7 +635,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/BSD-4-Clause.json", - "referenceNumber": "69", + "referenceNumber": "72", "name": "BSD 4-Clause \"Original\" or \"Old\" License", "licenseId": "BSD-4-Clause", "seeAlso": [ @@ -633,7 +647,7 @@ "reference": "./BSD-4-Clause-UC.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-4-Clause-UC.json", - "referenceNumber": "372", + "referenceNumber": "391", "name": "BSD-4-Clause (University of California-Specific)", "licenseId": "BSD-4-Clause-UC", "seeAlso": [ @@ -645,7 +659,7 @@ "reference": "./BSD-Protection.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-Protection.json", - "referenceNumber": "400", + "referenceNumber": "419", "name": "BSD Protection License", "licenseId": "BSD-Protection", "seeAlso": [ @@ -657,7 +671,7 @@ "reference": "./BSD-Source-Code.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BSD-Source-Code.json", - "referenceNumber": "169", + "referenceNumber": "174", "name": "BSD Source Code Attribution", "licenseId": "BSD-Source-Code", "seeAlso": [ @@ -670,7 +684,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/BSL-1.0.json", - "referenceNumber": "295", + "referenceNumber": "309", "name": "Boost Software License 1.0", "licenseId": "BSL-1.0", "seeAlso": [ @@ -683,7 +697,7 @@ "reference": "./Bahyph.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Bahyph.json", - "referenceNumber": "151", + "referenceNumber": "155", "name": "Bahyph License", "licenseId": "Bahyph", "seeAlso": [ @@ -695,7 +709,7 @@ "reference": "./Barr.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Barr.json", - "referenceNumber": "128", + "referenceNumber": "132", "name": "Barr License", "licenseId": "Barr", "seeAlso": [ @@ -707,7 +721,7 @@ "reference": "./Beerware.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Beerware.json", - "referenceNumber": "251", + "referenceNumber": "263", "name": "Beerware License", "licenseId": "Beerware", "seeAlso": [ @@ -720,7 +734,7 @@ "reference": "./BitTorrent-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BitTorrent-1.0.json", - "referenceNumber": "207", + "referenceNumber": "217", "name": "BitTorrent Open Source License v1.0", "licenseId": "BitTorrent-1.0", "seeAlso": [ @@ -733,7 +747,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/BitTorrent-1.1.json", - "referenceNumber": "188", + "referenceNumber": "196", "name": "BitTorrent Open Source License v1.1", "licenseId": "BitTorrent-1.1", "seeAlso": [ @@ -745,7 +759,7 @@ "reference": "./BlueOak-1.0.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/BlueOak-1.0.0.json", - "referenceNumber": "211", + "referenceNumber": "221", "name": "Blue Oak Model License 1.0.0", "licenseId": "BlueOak-1.0.0", "seeAlso": [ @@ -757,7 +771,7 @@ "reference": "./Borceux.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Borceux.json", - "referenceNumber": "305", + "referenceNumber": "321", "name": "Borceux license", "licenseId": "Borceux", "seeAlso": [ @@ -769,7 +783,7 @@ "reference": "./CAL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CAL-1.0.json", - "referenceNumber": "59", + "referenceNumber": "62", "name": "Cryptographic Autonomy License 1.0", "licenseId": "CAL-1.0", "seeAlso": [ @@ -782,7 +796,7 @@ "reference": "./CAL-1.0-Combined-Work-Exception.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CAL-1.0-Combined-Work-Exception.json", - "referenceNumber": "80", + "referenceNumber": "83", "name": "Cryptographic Autonomy License 1.0 (Combined Work Exception)", "licenseId": "CAL-1.0-Combined-Work-Exception", "seeAlso": [ @@ -795,7 +809,7 @@ "reference": "./CATOSL-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CATOSL-1.1.json", - "referenceNumber": "234", + "referenceNumber": "245", "name": "Computer Associates Trusted Open Source License 1.1", "licenseId": "CATOSL-1.1", "seeAlso": [ @@ -807,7 +821,7 @@ "reference": "./CC-BY-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-1.0.json", - "referenceNumber": "23", + "referenceNumber": "24", "name": "Creative Commons Attribution 1.0 Generic", "licenseId": "CC-BY-1.0", "seeAlso": [ @@ -819,7 +833,7 @@ "reference": "./CC-BY-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-2.0.json", - "referenceNumber": "61", + "referenceNumber": "64", "name": "Creative Commons Attribution 2.0 Generic", "licenseId": "CC-BY-2.0", "seeAlso": [ @@ -831,7 +845,7 @@ "reference": "./CC-BY-2.5.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-2.5.json", - "referenceNumber": "187", + "referenceNumber": "194", "name": "Creative Commons Attribution 2.5 Generic", "licenseId": "CC-BY-2.5", "seeAlso": [ @@ -843,7 +857,7 @@ "reference": "./CC-BY-3.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-3.0.json", - "referenceNumber": "344", + "referenceNumber": "361", "name": "Creative Commons Attribution 3.0 Unported", "licenseId": "CC-BY-3.0", "seeAlso": [ @@ -852,11 +866,23 @@ "isOsiApproved": false }, { + "reference": "./CC-BY-3.0-AT.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/CC-BY-3.0-AT.json", + "referenceNumber": "237", + "name": "Creative Commons Attribution 3.0 Austria", + "licenseId": "CC-BY-3.0-AT", + "seeAlso": [ + "https://creativecommons.org/licenses/by/3.0/at/legalcode" + ], + "isOsiApproved": false + }, + { "reference": "./CC-BY-4.0.html", "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/CC-BY-4.0.json", - "referenceNumber": "218", + "referenceNumber": "228", "name": "Creative Commons Attribution 4.0 International", "licenseId": "CC-BY-4.0", "seeAlso": [ @@ -868,7 +894,7 @@ "reference": "./CC-BY-NC-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-1.0.json", - "referenceNumber": "231", + "referenceNumber": "242", "name": "Creative Commons Attribution Non Commercial 1.0 Generic", "licenseId": "CC-BY-NC-1.0", "seeAlso": [ @@ -880,7 +906,7 @@ "reference": "./CC-BY-NC-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-2.0.json", - "referenceNumber": "326", + "referenceNumber": "343", "name": "Creative Commons Attribution Non Commercial 2.0 Generic", "licenseId": "CC-BY-NC-2.0", "seeAlso": [ @@ -892,7 +918,7 @@ "reference": "./CC-BY-NC-2.5.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-2.5.json", - "referenceNumber": "398", + "referenceNumber": "417", "name": "Creative Commons Attribution Non Commercial 2.5 Generic", "licenseId": "CC-BY-NC-2.5", "seeAlso": [ @@ -904,7 +930,7 @@ "reference": "./CC-BY-NC-3.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-3.0.json", - "referenceNumber": "336", + "referenceNumber": "353", "name": "Creative Commons Attribution Non Commercial 3.0 Unported", "licenseId": "CC-BY-NC-3.0", "seeAlso": [ @@ -916,7 +942,7 @@ "reference": "./CC-BY-NC-4.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-4.0.json", - "referenceNumber": "272", + "referenceNumber": "284", "name": "Creative Commons Attribution Non Commercial 4.0 International", "licenseId": "CC-BY-NC-4.0", "seeAlso": [ @@ -928,7 +954,7 @@ "reference": "./CC-BY-NC-ND-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-ND-1.0.json", - "referenceNumber": "102", + "referenceNumber": "106", "name": "Creative Commons Attribution Non Commercial No Derivatives 1.0 Generic", "licenseId": "CC-BY-NC-ND-1.0", "seeAlso": [ @@ -940,7 +966,7 @@ "reference": "./CC-BY-NC-ND-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-ND-2.0.json", - "referenceNumber": "138", + "referenceNumber": "142", "name": "Creative Commons Attribution Non Commercial No Derivatives 2.0 Generic", "licenseId": "CC-BY-NC-ND-2.0", "seeAlso": [ @@ -952,7 +978,7 @@ "reference": "./CC-BY-NC-ND-2.5.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-ND-2.5.json", - "referenceNumber": "30", + "referenceNumber": "31", "name": "Creative Commons Attribution Non Commercial No Derivatives 2.5 Generic", "licenseId": "CC-BY-NC-ND-2.5", "seeAlso": [ @@ -964,7 +990,7 @@ "reference": "./CC-BY-NC-ND-3.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-ND-3.0.json", - "referenceNumber": "41", + "referenceNumber": "43", "name": "Creative Commons Attribution Non Commercial No Derivatives 3.0 Unported", "licenseId": "CC-BY-NC-ND-3.0", "seeAlso": [ @@ -973,10 +999,22 @@ "isOsiApproved": false }, { + "reference": "./CC-BY-NC-ND-3.0-IGO.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-ND-3.0-IGO.json", + "referenceNumber": "366", + "name": "Creative Commons Attribution Non Commercial No Derivatives 3.0 IGO", + "licenseId": "CC-BY-NC-ND-3.0-IGO", + "seeAlso": [ + "https://creativecommons.org/licenses/by-nc-nd/3.0/igo/legalcode" + ], + "isOsiApproved": false + }, + { "reference": "./CC-BY-NC-ND-4.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-ND-4.0.json", - "referenceNumber": "172", + "referenceNumber": "177", "name": "Creative Commons Attribution Non Commercial No Derivatives 4.0 International", "licenseId": "CC-BY-NC-ND-4.0", "seeAlso": [ @@ -988,7 +1026,7 @@ "reference": "./CC-BY-NC-SA-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-SA-1.0.json", - "referenceNumber": "120", + "referenceNumber": "124", "name": "Creative Commons Attribution Non Commercial Share Alike 1.0 Generic", "licenseId": "CC-BY-NC-SA-1.0", "seeAlso": [ @@ -1000,7 +1038,7 @@ "reference": "./CC-BY-NC-SA-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-SA-2.0.json", - "referenceNumber": "411", + "referenceNumber": "431", "name": "Creative Commons Attribution Non Commercial Share Alike 2.0 Generic", "licenseId": "CC-BY-NC-SA-2.0", "seeAlso": [ @@ -1012,7 +1050,7 @@ "reference": "./CC-BY-NC-SA-2.5.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-SA-2.5.json", - "referenceNumber": "215", + "referenceNumber": "225", "name": "Creative Commons Attribution Non Commercial Share Alike 2.5 Generic", "licenseId": "CC-BY-NC-SA-2.5", "seeAlso": [ @@ -1024,7 +1062,7 @@ "reference": "./CC-BY-NC-SA-3.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-SA-3.0.json", - "referenceNumber": "360", + "referenceNumber": "379", "name": "Creative Commons Attribution Non Commercial Share Alike 3.0 Unported", "licenseId": "CC-BY-NC-SA-3.0", "seeAlso": [ @@ -1036,7 +1074,7 @@ "reference": "./CC-BY-NC-SA-4.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-NC-SA-4.0.json", - "referenceNumber": "331", + "referenceNumber": "348", "name": "Creative Commons Attribution Non Commercial Share Alike 4.0 International", "licenseId": "CC-BY-NC-SA-4.0", "seeAlso": [ @@ -1048,7 +1086,7 @@ "reference": "./CC-BY-ND-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-ND-1.0.json", - "referenceNumber": "94", + "referenceNumber": "98", "name": "Creative Commons Attribution No Derivatives 1.0 Generic", "licenseId": "CC-BY-ND-1.0", "seeAlso": [ @@ -1060,7 +1098,7 @@ "reference": "./CC-BY-ND-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-ND-2.0.json", - "referenceNumber": "46", + "referenceNumber": "48", "name": "Creative Commons Attribution No Derivatives 2.0 Generic", "licenseId": "CC-BY-ND-2.0", "seeAlso": [ @@ -1072,7 +1110,7 @@ "reference": "./CC-BY-ND-2.5.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-ND-2.5.json", - "referenceNumber": "27", + "referenceNumber": "28", "name": "Creative Commons Attribution No Derivatives 2.5 Generic", "licenseId": "CC-BY-ND-2.5", "seeAlso": [ @@ -1084,7 +1122,7 @@ "reference": "./CC-BY-ND-3.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-ND-3.0.json", - "referenceNumber": "284", + "referenceNumber": "297", "name": "Creative Commons Attribution No Derivatives 3.0 Unported", "licenseId": "CC-BY-ND-3.0", "seeAlso": [ @@ -1096,7 +1134,7 @@ "reference": "./CC-BY-ND-4.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-ND-4.0.json", - "referenceNumber": "318", + "referenceNumber": "335", "name": "Creative Commons Attribution No Derivatives 4.0 International", "licenseId": "CC-BY-ND-4.0", "seeAlso": [ @@ -1108,7 +1146,7 @@ "reference": "./CC-BY-SA-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-SA-1.0.json", - "referenceNumber": "403", + "referenceNumber": "422", "name": "Creative Commons Attribution Share Alike 1.0 Generic", "licenseId": "CC-BY-SA-1.0", "seeAlso": [ @@ -1120,7 +1158,7 @@ "reference": "./CC-BY-SA-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-SA-2.0.json", - "referenceNumber": "367", + "referenceNumber": "386", "name": "Creative Commons Attribution Share Alike 2.0 Generic", "licenseId": "CC-BY-SA-2.0", "seeAlso": [ @@ -1132,7 +1170,7 @@ "reference": "./CC-BY-SA-2.5.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-SA-2.5.json", - "referenceNumber": "203", + "referenceNumber": "213", "name": "Creative Commons Attribution Share Alike 2.5 Generic", "licenseId": "CC-BY-SA-2.5", "seeAlso": [ @@ -1144,7 +1182,7 @@ "reference": "./CC-BY-SA-3.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-BY-SA-3.0.json", - "referenceNumber": "233", + "referenceNumber": "244", "name": "Creative Commons Attribution Share Alike 3.0 Unported", "licenseId": "CC-BY-SA-3.0", "seeAlso": [ @@ -1153,11 +1191,23 @@ "isOsiApproved": false }, { + "reference": "./CC-BY-SA-3.0-AT.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/CC-BY-SA-3.0-AT.json", + "referenceNumber": "305", + "name": "Creative Commons Attribution-Share Alike 3.0 Austria", + "licenseId": "CC-BY-SA-3.0-AT", + "seeAlso": [ + "https://creativecommons.org/licenses/by-sa/3.0/at/legalcode" + ], + "isOsiApproved": false + }, + { "reference": "./CC-BY-SA-4.0.html", "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/CC-BY-SA-4.0.json", - "referenceNumber": "297", + "referenceNumber": "311", "name": "Creative Commons Attribution Share Alike 4.0 International", "licenseId": "CC-BY-SA-4.0", "seeAlso": [ @@ -1169,7 +1219,7 @@ "reference": "./CC-PDDC.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CC-PDDC.json", - "referenceNumber": "92", + "referenceNumber": "96", "name": "Creative Commons Public Domain Dedication and Certification", "licenseId": "CC-PDDC", "seeAlso": [ @@ -1182,7 +1232,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/CC0-1.0.json", - "referenceNumber": "66", + "referenceNumber": "69", "name": "Creative Commons Zero v1.0 Universal", "licenseId": "CC0-1.0", "seeAlso": [ @@ -1195,7 +1245,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/CDDL-1.0.json", - "referenceNumber": "335", + "referenceNumber": "352", "name": "Common Development and Distribution License 1.0", "licenseId": "CDDL-1.0", "seeAlso": [ @@ -1207,7 +1257,7 @@ "reference": "./CDDL-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CDDL-1.1.json", - "referenceNumber": "283", + "referenceNumber": "296", "name": "Common Development and Distribution License 1.1", "licenseId": "CDDL-1.1", "seeAlso": [ @@ -1220,7 +1270,7 @@ "reference": "./CDLA-Permissive-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CDLA-Permissive-1.0.json", - "referenceNumber": "108", + "referenceNumber": "112", "name": "Community Data License Agreement Permissive 1.0", "licenseId": "CDLA-Permissive-1.0", "seeAlso": [ @@ -1232,7 +1282,7 @@ "reference": "./CDLA-Sharing-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CDLA-Sharing-1.0.json", - "referenceNumber": "178", + "referenceNumber": "184", "name": "Community Data License Agreement Sharing 1.0", "licenseId": "CDLA-Sharing-1.0", "seeAlso": [ @@ -1244,7 +1294,7 @@ "reference": "./CECILL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CECILL-1.0.json", - "referenceNumber": "10", + "referenceNumber": "11", "name": "CeCILL Free Software License Agreement v1.0", "licenseId": "CECILL-1.0", "seeAlso": [ @@ -1256,7 +1306,7 @@ "reference": "./CECILL-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CECILL-1.1.json", - "referenceNumber": "135", + "referenceNumber": "139", "name": "CeCILL Free Software License Agreement v1.1", "licenseId": "CECILL-1.1", "seeAlso": [ @@ -1281,7 +1331,7 @@ "reference": "./CECILL-2.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CECILL-2.1.json", - "referenceNumber": "145", + "referenceNumber": "149", "name": "CeCILL Free Software License Agreement v2.1", "licenseId": "CECILL-2.1", "seeAlso": [ @@ -1294,7 +1344,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/CECILL-B.json", - "referenceNumber": "93", + "referenceNumber": "97", "name": "CeCILL-B Free Software License Agreement", "licenseId": "CECILL-B", "seeAlso": [ @@ -1307,7 +1357,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/CECILL-C.json", - "referenceNumber": "240", + "referenceNumber": "251", "name": "CeCILL-C Free Software License Agreement", "licenseId": "CECILL-C", "seeAlso": [ @@ -1319,7 +1369,7 @@ "reference": "./CERN-OHL-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CERN-OHL-1.1.json", - "referenceNumber": "123", + "referenceNumber": "127", "name": "CERN Open Hardware Licence v1.1", "licenseId": "CERN-OHL-1.1", "seeAlso": [ @@ -1331,7 +1381,7 @@ "reference": "./CERN-OHL-1.2.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CERN-OHL-1.2.json", - "referenceNumber": "167", + "referenceNumber": "172", "name": "CERN Open Hardware Licence v1.2", "licenseId": "CERN-OHL-1.2", "seeAlso": [ @@ -1343,7 +1393,7 @@ "reference": "./CERN-OHL-P-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CERN-OHL-P-2.0.json", - "referenceNumber": "255", + "referenceNumber": "267", "name": "CERN Open Hardware Licence Version 2 - Permissive", "licenseId": "CERN-OHL-P-2.0", "seeAlso": [ @@ -1355,7 +1405,7 @@ "reference": "./CERN-OHL-S-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CERN-OHL-S-2.0.json", - "referenceNumber": "47", + "referenceNumber": "49", "name": "CERN Open Hardware Licence Version 2 - Strongly Reciprocal", "licenseId": "CERN-OHL-S-2.0", "seeAlso": [ @@ -1367,7 +1417,7 @@ "reference": "./CERN-OHL-W-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CERN-OHL-W-2.0.json", - "referenceNumber": "267", + "referenceNumber": "279", "name": "CERN Open Hardware Licence Version 2 - Weakly Reciprocal", "licenseId": "CERN-OHL-W-2.0", "seeAlso": [ @@ -1379,7 +1429,7 @@ "reference": "./CNRI-Jython.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CNRI-Jython.json", - "referenceNumber": "77", + "referenceNumber": "80", "name": "CNRI Jython License", "licenseId": "CNRI-Jython", "seeAlso": [ @@ -1391,7 +1441,7 @@ "reference": "./CNRI-Python.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CNRI-Python.json", - "referenceNumber": "96", + "referenceNumber": "100", "name": "CNRI Python License", "licenseId": "CNRI-Python", "seeAlso": [ @@ -1403,7 +1453,7 @@ "reference": "./CNRI-Python-GPL-Compatible.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CNRI-Python-GPL-Compatible.json", - "referenceNumber": "348", + "referenceNumber": "365", "name": "CNRI Python Open Source GPL Compatible License Agreement", "licenseId": "CNRI-Python-GPL-Compatible", "seeAlso": [ @@ -1416,7 +1466,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/CPAL-1.0.json", - "referenceNumber": "285", + "referenceNumber": "298", "name": "Common Public Attribution License 1.0", "licenseId": "CPAL-1.0", "seeAlso": [ @@ -1429,7 +1479,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/CPL-1.0.json", - "referenceNumber": "236", + "referenceNumber": "247", "name": "Common Public License 1.0", "licenseId": "CPL-1.0", "seeAlso": [ @@ -1441,7 +1491,7 @@ "reference": "./CPOL-1.02.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CPOL-1.02.json", - "referenceNumber": "230", + "referenceNumber": "241", "name": "Code Project Open License 1.02", "licenseId": "CPOL-1.02", "seeAlso": [ @@ -1453,7 +1503,7 @@ "reference": "./CUA-OPL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CUA-OPL-1.0.json", - "referenceNumber": "165", + "referenceNumber": "170", "name": "CUA Office Public License v1.0", "licenseId": "CUA-OPL-1.0", "seeAlso": [ @@ -1465,7 +1515,7 @@ "reference": "./Caldera.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Caldera.json", - "referenceNumber": "250", + "referenceNumber": "262", "name": "Caldera License", "licenseId": "Caldera", "seeAlso": [ @@ -1478,7 +1528,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/ClArtistic.json", - "referenceNumber": "245", + "referenceNumber": "257", "name": "Clarified Artistic License", "licenseId": "ClArtistic", "seeAlso": [ @@ -1492,7 +1542,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Condor-1.1.json", - "referenceNumber": "150", + "referenceNumber": "154", "name": "Condor Public License v1.1", "licenseId": "Condor-1.1", "seeAlso": [ @@ -1505,7 +1555,7 @@ "reference": "./Crossword.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Crossword.json", - "referenceNumber": "101", + "referenceNumber": "105", "name": "Crossword License", "licenseId": "Crossword", "seeAlso": [ @@ -1517,7 +1567,7 @@ "reference": "./CrystalStacker.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/CrystalStacker.json", - "referenceNumber": "38", + "referenceNumber": "40", "name": "CrystalStacker License", "licenseId": "CrystalStacker", "seeAlso": [ @@ -1529,7 +1579,7 @@ "reference": "./Cube.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Cube.json", - "referenceNumber": "391", + "referenceNumber": "410", "name": "Cube License", "licenseId": "Cube", "seeAlso": [ @@ -1541,7 +1591,7 @@ "reference": "./D-FSL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/D-FSL-1.0.json", - "referenceNumber": "358", + "referenceNumber": "376", "name": "Deutsche Freie Software Lizenz", "licenseId": "D-FSL-1.0", "seeAlso": [ @@ -1560,7 +1610,7 @@ "reference": "./DOC.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/DOC.json", - "referenceNumber": "275", + "referenceNumber": "287", "name": "DOC License", "licenseId": "DOC", "seeAlso": [ @@ -1572,7 +1622,7 @@ "reference": "./DSDP.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/DSDP.json", - "referenceNumber": "266", + "referenceNumber": "278", "name": "DSDP License", "licenseId": "DSDP", "seeAlso": [ @@ -1584,7 +1634,7 @@ "reference": "./Dotseqn.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Dotseqn.json", - "referenceNumber": "33", + "referenceNumber": "34", "name": "Dotseqn License", "licenseId": "Dotseqn", "seeAlso": [ @@ -1596,7 +1646,7 @@ "reference": "./ECL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/ECL-1.0.json", - "referenceNumber": "418", + "referenceNumber": "438", "name": "Educational Community License v1.0", "licenseId": "ECL-1.0", "seeAlso": [ @@ -1621,7 +1671,7 @@ "reference": "./EFL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/EFL-1.0.json", - "referenceNumber": "76", + "referenceNumber": "79", "name": "Eiffel Forum License v1.0", "licenseId": "EFL-1.0", "seeAlso": [ @@ -1635,7 +1685,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/EFL-2.0.json", - "referenceNumber": "7", + "referenceNumber": "8", "name": "Eiffel Forum License v2.0", "licenseId": "EFL-2.0", "seeAlso": [ @@ -1645,11 +1695,23 @@ "isOsiApproved": true }, { + "reference": "./EPICS.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/EPICS.json", + "referenceNumber": "377", + "name": "EPICS Open License", + "licenseId": "EPICS", + "seeAlso": [ + "https://epics.anl.gov/license/open.php" + ], + "isOsiApproved": false + }, + { "reference": "./EPL-1.0.html", "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/EPL-1.0.json", - "referenceNumber": "277", + "referenceNumber": "289", "name": "Eclipse Public License 1.0", "licenseId": "EPL-1.0", "seeAlso": [ @@ -1663,7 +1725,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/EPL-2.0.json", - "referenceNumber": "416", + "referenceNumber": "436", "name": "Eclipse Public License 2.0", "licenseId": "EPL-2.0", "seeAlso": [ @@ -1677,7 +1739,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/EUDatagrid.json", - "referenceNumber": "263", + "referenceNumber": "275", "name": "EU DataGrid Software License", "licenseId": "EUDatagrid", "seeAlso": [ @@ -1690,7 +1752,7 @@ "reference": "./EUPL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/EUPL-1.0.json", - "referenceNumber": "98", + "referenceNumber": "102", "name": "European Union Public License 1.0", "licenseId": "EUPL-1.0", "seeAlso": [ @@ -1704,7 +1766,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/EUPL-1.1.json", - "referenceNumber": "409", + "referenceNumber": "429", "name": "European Union Public License 1.1", "licenseId": "EUPL-1.1", "seeAlso": [ @@ -1719,7 +1781,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/EUPL-1.2.json", - "referenceNumber": "271", + "referenceNumber": "283", "name": "European Union Public License 1.2", "licenseId": "EUPL-1.2", "seeAlso": [ @@ -1727,7 +1789,7 @@ "https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/eupl_v1.2_en.pdf", "https://joinup.ec.europa.eu/sites/default/files/inline-files/EUPL%20v1_2%20EN(1).txt", "http://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri\u003dCELEX:32017D0863", - "https://opensource.org/licenses/EUPL-1.1" + "https://opensource.org/licenses/EUPL-1.2" ], "isOsiApproved": true }, @@ -1735,7 +1797,7 @@ "reference": "./Entessa.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Entessa.json", - "referenceNumber": "386", + "referenceNumber": "405", "name": "Entessa Public License v1.0", "licenseId": "Entessa", "seeAlso": [ @@ -1747,7 +1809,7 @@ "reference": "./ErlPL-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/ErlPL-1.1.json", - "referenceNumber": "408", + "referenceNumber": "427", "name": "Erlang Public License v1.1", "licenseId": "ErlPL-1.1", "seeAlso": [ @@ -1759,7 +1821,7 @@ "reference": "./Eurosym.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Eurosym.json", - "referenceNumber": "171", + "referenceNumber": "176", "name": "Eurosym License", "licenseId": "Eurosym", "seeAlso": [ @@ -1772,7 +1834,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/FSFAP.json", - "referenceNumber": "394", + "referenceNumber": "413", "name": "FSF All Permissive License", "licenseId": "FSFAP", "seeAlso": [ @@ -1796,7 +1858,7 @@ "reference": "./FSFULLR.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/FSFULLR.json", - "referenceNumber": "308", + "referenceNumber": "325", "name": "FSF Unlimited License (with License Retention)", "licenseId": "FSFULLR", "seeAlso": [ @@ -1809,7 +1871,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/FTL.json", - "referenceNumber": "374", + "referenceNumber": "393", "name": "Freetype Project License", "licenseId": "FTL", "seeAlso": [ @@ -1822,7 +1884,7 @@ "reference": "./Fair.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Fair.json", - "referenceNumber": "262", + "referenceNumber": "274", "name": "Fair License", "licenseId": "Fair", "seeAlso": [ @@ -1835,7 +1897,7 @@ "reference": "./Frameworx-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Frameworx-1.0.json", - "referenceNumber": "373", + "referenceNumber": "392", "name": "Frameworx Open License 1.0", "licenseId": "Frameworx-1.0", "seeAlso": [ @@ -1847,7 +1909,7 @@ "reference": "./FreeImage.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/FreeImage.json", - "referenceNumber": "370", + "referenceNumber": "389", "name": "FreeImage Public License v1.0", "licenseId": "FreeImage", "seeAlso": [ @@ -1860,7 +1922,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GFDL-1.1.json", - "referenceNumber": "257", + "referenceNumber": "269", "name": "GNU Free Documentation License v1.1", "licenseId": "GFDL-1.1", "seeAlso": [ @@ -1869,11 +1931,59 @@ "isOsiApproved": false }, { + "reference": "./GFDL-1.1-invariants-only.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.1-invariants-only.json", + "referenceNumber": "205", + "name": "GNU Free Documentation License v1.1 only - invariants", + "licenseId": "GFDL-1.1-invariants-only", + "seeAlso": [ + "https://www.gnu.org/licenses/old-licenses/fdl-1.1.txt" + ], + "isOsiApproved": false + }, + { + "reference": "./GFDL-1.1-invariants-or-later.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.1-invariants-or-later.json", + "referenceNumber": "85", + "name": "GNU Free Documentation License v1.1 or later - invariants", + "licenseId": "GFDL-1.1-invariants-or-later", + "seeAlso": [ + "https://www.gnu.org/licenses/old-licenses/fdl-1.1.txt" + ], + "isOsiApproved": false + }, + { + "reference": "./GFDL-1.1-no-invariants-only.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.1-no-invariants-only.json", + "referenceNumber": "7", + "name": "GNU Free Documentation License v1.1 only - no invariants", + "licenseId": "GFDL-1.1-no-invariants-only", + "seeAlso": [ + "https://www.gnu.org/licenses/old-licenses/fdl-1.1.txt" + ], + "isOsiApproved": false + }, + { + "reference": "./GFDL-1.1-no-invariants-or-later.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.1-no-invariants-or-later.json", + "referenceNumber": "254", + "name": "GNU Free Documentation License v1.1 or later - no invariants", + "licenseId": "GFDL-1.1-no-invariants-or-later", + "seeAlso": [ + "https://www.gnu.org/licenses/old-licenses/fdl-1.1.txt" + ], + "isOsiApproved": false + }, + { "reference": "./GFDL-1.1-only.html", "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GFDL-1.1-only.json", - "referenceNumber": "104", + "referenceNumber": "108", "name": "GNU Free Documentation License v1.1 only", "licenseId": "GFDL-1.1-only", "seeAlso": [ @@ -1886,7 +1996,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GFDL-1.1-or-later.json", - "referenceNumber": "124", + "referenceNumber": "128", "name": "GNU Free Documentation License v1.1 or later", "licenseId": "GFDL-1.1-or-later", "seeAlso": [ @@ -1899,7 +2009,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GFDL-1.2.json", - "referenceNumber": "197", + "referenceNumber": "206", "name": "GNU Free Documentation License v1.2", "licenseId": "GFDL-1.2", "seeAlso": [ @@ -1908,11 +2018,59 @@ "isOsiApproved": false }, { + "reference": "./GFDL-1.2-invariants-only.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.2-invariants-only.json", + "referenceNumber": "208", + "name": "GNU Free Documentation License v1.2 only - invariants", + "licenseId": "GFDL-1.2-invariants-only", + "seeAlso": [ + "https://www.gnu.org/licenses/old-licenses/fdl-1.2.txt" + ], + "isOsiApproved": false + }, + { + "reference": "./GFDL-1.2-invariants-or-later.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.2-invariants-or-later.json", + "referenceNumber": "428", + "name": "GNU Free Documentation License v1.2 or later - invariants", + "licenseId": "GFDL-1.2-invariants-or-later", + "seeAlso": [ + "https://www.gnu.org/licenses/old-licenses/fdl-1.2.txt" + ], + "isOsiApproved": false + }, + { + "reference": "./GFDL-1.2-no-invariants-only.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.2-no-invariants-only.json", + "referenceNumber": "324", + "name": "GNU Free Documentation License v1.2 only - no invariants", + "licenseId": "GFDL-1.2-no-invariants-only", + "seeAlso": [ + "https://www.gnu.org/licenses/old-licenses/fdl-1.2.txt" + ], + "isOsiApproved": false + }, + { + "reference": "./GFDL-1.2-no-invariants-or-later.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.2-no-invariants-or-later.json", + "referenceNumber": "195", + "name": "GNU Free Documentation License v1.2 or later - no invariants", + "licenseId": "GFDL-1.2-no-invariants-or-later", + "seeAlso": [ + "https://www.gnu.org/licenses/old-licenses/fdl-1.2.txt" + ], + "isOsiApproved": false + }, + { "reference": "./GFDL-1.2-only.html", "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GFDL-1.2-only.json", - "referenceNumber": "90", + "referenceNumber": "94", "name": "GNU Free Documentation License v1.2 only", "licenseId": "GFDL-1.2-only", "seeAlso": [ @@ -1925,7 +2083,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GFDL-1.2-or-later.json", - "referenceNumber": "132", + "referenceNumber": "136", "name": "GNU Free Documentation License v1.2 or later", "licenseId": "GFDL-1.2-or-later", "seeAlso": [ @@ -1938,7 +2096,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GFDL-1.3.json", - "referenceNumber": "365", + "referenceNumber": "384", "name": "GNU Free Documentation License v1.3", "licenseId": "GFDL-1.3", "seeAlso": [ @@ -1947,11 +2105,59 @@ "isOsiApproved": false }, { + "reference": "./GFDL-1.3-invariants-only.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.3-invariants-only.json", + "referenceNumber": "187", + "name": "GNU Free Documentation License v1.3 only - invariants", + "licenseId": "GFDL-1.3-invariants-only", + "seeAlso": [ + "https://www.gnu.org/licenses/fdl-1.3.txt" + ], + "isOsiApproved": false + }, + { + "reference": "./GFDL-1.3-invariants-or-later.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.3-invariants-or-later.json", + "referenceNumber": "319", + "name": "GNU Free Documentation License v1.3 or later - invariants", + "licenseId": "GFDL-1.3-invariants-or-later", + "seeAlso": [ + "https://www.gnu.org/licenses/fdl-1.3.txt" + ], + "isOsiApproved": false + }, + { + "reference": "./GFDL-1.3-no-invariants-only.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.3-no-invariants-only.json", + "referenceNumber": "183", + "name": "GNU Free Documentation License v1.3 only - no invariants", + "licenseId": "GFDL-1.3-no-invariants-only", + "seeAlso": [ + "https://www.gnu.org/licenses/fdl-1.3.txt" + ], + "isOsiApproved": false + }, + { + "reference": "./GFDL-1.3-no-invariants-or-later.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GFDL-1.3-no-invariants-or-later.json", + "referenceNumber": "167", + "name": "GNU Free Documentation License v1.3 or later - no invariants", + "licenseId": "GFDL-1.3-no-invariants-or-later", + "seeAlso": [ + "https://www.gnu.org/licenses/fdl-1.3.txt" + ], + "isOsiApproved": false + }, + { "reference": "./GFDL-1.3-only.html", "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GFDL-1.3-only.json", - "referenceNumber": "200", + "referenceNumber": "210", "name": "GNU Free Documentation License v1.3 only", "licenseId": "GFDL-1.3-only", "seeAlso": [ @@ -1964,7 +2170,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GFDL-1.3-or-later.json", - "referenceNumber": "53", + "referenceNumber": "56", "name": "GNU Free Documentation License v1.3 or later", "licenseId": "GFDL-1.3-or-later", "seeAlso": [ @@ -1976,7 +2182,7 @@ "reference": "./GL2PS.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/GL2PS.json", - "referenceNumber": "314", + "referenceNumber": "331", "name": "GL2PS License", "licenseId": "GL2PS", "seeAlso": [ @@ -1985,10 +2191,22 @@ "isOsiApproved": false }, { + "reference": "./GLWTPL.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/GLWTPL.json", + "referenceNumber": "55", + "name": "Good Luck With That Public License", + "licenseId": "GLWTPL", + "seeAlso": [ + "https://github.com/me-shaon/GLWTPL/commit/da5f6bc734095efbacb442c0b31e33a65b9d6e85" + ], + "isOsiApproved": false + }, + { "reference": "./GPL-1.0.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/GPL-1.0.json", - "referenceNumber": "330", + "referenceNumber": "347", "name": "GNU General Public License v1.0 only", "licenseId": "GPL-1.0", "seeAlso": [ @@ -2000,7 +2218,7 @@ "reference": "./GPL-1.0+.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/GPL-1.0+.json", - "referenceNumber": "205", + "referenceNumber": "215", "name": "GNU General Public License v1.0 or later", "licenseId": "GPL-1.0+", "seeAlso": [ @@ -2012,7 +2230,7 @@ "reference": "./GPL-1.0-only.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/GPL-1.0-only.json", - "referenceNumber": "15", + "referenceNumber": "16", "name": "GNU General Public License v1.0 only", "licenseId": "GPL-1.0-only", "seeAlso": [ @@ -2024,7 +2242,7 @@ "reference": "./GPL-1.0-or-later.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/GPL-1.0-or-later.json", - "referenceNumber": "134", + "referenceNumber": "138", "name": "GNU General Public License v1.0 or later", "licenseId": "GPL-1.0-or-later", "seeAlso": [ @@ -2037,7 +2255,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GPL-2.0.json", - "referenceNumber": "356", + "referenceNumber": "374", "name": "GNU General Public License v2.0 only", "licenseId": "GPL-2.0", "seeAlso": [ @@ -2051,7 +2269,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GPL-2.0+.json", - "referenceNumber": "401", + "referenceNumber": "420", "name": "GNU General Public License v2.0 or later", "licenseId": "GPL-2.0+", "seeAlso": [ @@ -2065,7 +2283,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GPL-2.0-only.json", - "referenceNumber": "235", + "referenceNumber": "246", "name": "GNU General Public License v2.0 only", "licenseId": "GPL-2.0-only", "seeAlso": [ @@ -2079,7 +2297,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GPL-2.0-or-later.json", - "referenceNumber": "258", + "referenceNumber": "270", "name": "GNU General Public License v2.0 or later", "licenseId": "GPL-2.0-or-later", "seeAlso": [ @@ -2092,7 +2310,7 @@ "reference": "./GPL-2.0-with-GCC-exception.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/GPL-2.0-with-GCC-exception.json", - "referenceNumber": "340", + "referenceNumber": "357", "name": "GNU General Public License v2.0 w/GCC Runtime Library exception", "licenseId": "GPL-2.0-with-GCC-exception", "seeAlso": [ @@ -2104,7 +2322,7 @@ "reference": "./GPL-2.0-with-autoconf-exception.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/GPL-2.0-with-autoconf-exception.json", - "referenceNumber": "36", + "referenceNumber": "37", "name": "GNU General Public License v2.0 w/Autoconf exception", "licenseId": "GPL-2.0-with-autoconf-exception", "seeAlso": [ @@ -2116,7 +2334,7 @@ "reference": "./GPL-2.0-with-bison-exception.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/GPL-2.0-with-bison-exception.json", - "referenceNumber": "371", + "referenceNumber": "390", "name": "GNU General Public License v2.0 w/Bison exception", "licenseId": "GPL-2.0-with-bison-exception", "seeAlso": [ @@ -2128,7 +2346,7 @@ "reference": "./GPL-2.0-with-classpath-exception.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/GPL-2.0-with-classpath-exception.json", - "referenceNumber": "227", + "referenceNumber": "238", "name": "GNU General Public License v2.0 w/Classpath exception", "licenseId": "GPL-2.0-with-classpath-exception", "seeAlso": [ @@ -2140,7 +2358,7 @@ "reference": "./GPL-2.0-with-font-exception.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/GPL-2.0-with-font-exception.json", - "referenceNumber": "24", + "referenceNumber": "25", "name": "GNU General Public License v2.0 w/Font exception", "licenseId": "GPL-2.0-with-font-exception", "seeAlso": [ @@ -2153,7 +2371,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GPL-3.0.json", - "referenceNumber": "414", + "referenceNumber": "434", "name": "GNU General Public License v3.0 only", "licenseId": "GPL-3.0", "seeAlso": [ @@ -2167,7 +2385,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GPL-3.0+.json", - "referenceNumber": "152", + "referenceNumber": "156", "name": "GNU General Public License v3.0 or later", "licenseId": "GPL-3.0+", "seeAlso": [ @@ -2181,7 +2399,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GPL-3.0-only.json", - "referenceNumber": "127", + "referenceNumber": "131", "name": "GNU General Public License v3.0 only", "licenseId": "GPL-3.0-only", "seeAlso": [ @@ -2195,7 +2413,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/GPL-3.0-or-later.json", - "referenceNumber": "399", + "referenceNumber": "418", "name": "GNU General Public License v3.0 or later", "licenseId": "GPL-3.0-or-later", "seeAlso": [ @@ -2220,7 +2438,7 @@ "reference": "./GPL-3.0-with-autoconf-exception.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/GPL-3.0-with-autoconf-exception.json", - "referenceNumber": "8", + "referenceNumber": "9", "name": "GNU General Public License v3.0 w/Autoconf exception", "licenseId": "GPL-3.0-with-autoconf-exception", "seeAlso": [ @@ -2232,7 +2450,7 @@ "reference": "./Giftware.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Giftware.json", - "referenceNumber": "379", + "referenceNumber": "398", "name": "Giftware License", "licenseId": "Giftware", "seeAlso": [ @@ -2244,7 +2462,7 @@ "reference": "./Glide.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Glide.json", - "referenceNumber": "121", + "referenceNumber": "125", "name": "3dfx Glide License", "licenseId": "Glide", "seeAlso": [ @@ -2256,7 +2474,7 @@ "reference": "./Glulxe.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Glulxe.json", - "referenceNumber": "206", + "referenceNumber": "216", "name": "Glulxe License", "licenseId": "Glulxe", "seeAlso": [ @@ -2269,7 +2487,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/HPND.json", - "referenceNumber": "154", + "referenceNumber": "158", "name": "Historical Permission Notice and Disclaimer", "licenseId": "HPND", "seeAlso": [ @@ -2281,7 +2499,7 @@ "reference": "./HPND-sell-variant.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/HPND-sell-variant.json", - "referenceNumber": "164", + "referenceNumber": "169", "name": "Historical Permission Notice and Disclaimer - sell variant", "licenseId": "HPND-sell-variant", "seeAlso": [ @@ -2293,7 +2511,7 @@ "reference": "./HaskellReport.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/HaskellReport.json", - "referenceNumber": "212", + "referenceNumber": "222", "name": "Haskell Language Report License", "licenseId": "HaskellReport", "seeAlso": [ @@ -2305,7 +2523,7 @@ "reference": "./Hippocratic-2.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Hippocratic-2.1.json", - "referenceNumber": "185", + "referenceNumber": "192", "name": "Hippocratic License 2.1", "licenseId": "Hippocratic-2.1", "seeAlso": [ @@ -2318,7 +2536,7 @@ "reference": "./IBM-pibs.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/IBM-pibs.json", - "referenceNumber": "241", + "referenceNumber": "252", "name": "IBM PowerPC Initialization and Boot Software", "licenseId": "IBM-pibs", "seeAlso": [ @@ -2330,7 +2548,7 @@ "reference": "./ICU.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/ICU.json", - "referenceNumber": "180", + "referenceNumber": "186", "name": "ICU License", "licenseId": "ICU", "seeAlso": [ @@ -2343,7 +2561,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/IJG.json", - "referenceNumber": "244", + "referenceNumber": "256", "name": "Independent JPEG Group License", "licenseId": "IJG", "seeAlso": [ @@ -2356,7 +2574,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/IPA.json", - "referenceNumber": "321", + "referenceNumber": "338", "name": "IPA Font License", "licenseId": "IPA", "seeAlso": [ @@ -2369,7 +2587,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/IPL-1.0.json", - "referenceNumber": "320", + "referenceNumber": "337", "name": "IBM Public License v1.0", "licenseId": "IPL-1.0", "seeAlso": [ @@ -2382,7 +2600,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/ISC.json", - "referenceNumber": "364", + "referenceNumber": "383", "name": "ISC License", "licenseId": "ISC", "seeAlso": [ @@ -2395,7 +2613,7 @@ "reference": "./ImageMagick.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/ImageMagick.json", - "referenceNumber": "337", + "referenceNumber": "354", "name": "ImageMagick License", "licenseId": "ImageMagick", "seeAlso": [ @@ -2408,7 +2626,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Imlib2.json", - "referenceNumber": "140", + "referenceNumber": "144", "name": "Imlib2 License", "licenseId": "Imlib2", "seeAlso": [ @@ -2421,7 +2639,7 @@ "reference": "./Info-ZIP.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Info-ZIP.json", - "referenceNumber": "294", + "referenceNumber": "308", "name": "Info-ZIP License", "licenseId": "Info-ZIP", "seeAlso": [ @@ -2434,7 +2652,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Intel.json", - "referenceNumber": "29", + "referenceNumber": "30", "name": "Intel Open Source License", "licenseId": "Intel", "seeAlso": [ @@ -2446,7 +2664,7 @@ "reference": "./Intel-ACPI.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Intel-ACPI.json", - "referenceNumber": "243", + "referenceNumber": "255", "name": "Intel ACPI Software License Agreement", "licenseId": "Intel-ACPI", "seeAlso": [ @@ -2458,7 +2676,7 @@ "reference": "./Interbase-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Interbase-1.0.json", - "referenceNumber": "334", + "referenceNumber": "351", "name": "Interbase Public License v1.0", "licenseId": "Interbase-1.0", "seeAlso": [ @@ -2470,7 +2688,7 @@ "reference": "./JPNIC.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/JPNIC.json", - "referenceNumber": "327", + "referenceNumber": "344", "name": "Japan Network Information Center License", "licenseId": "JPNIC", "seeAlso": [ @@ -2482,7 +2700,7 @@ "reference": "./JSON.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/JSON.json", - "referenceNumber": "204", + "referenceNumber": "214", "name": "JSON License", "licenseId": "JSON", "seeAlso": [ @@ -2494,7 +2712,7 @@ "reference": "./JasPer-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/JasPer-2.0.json", - "referenceNumber": "81", + "referenceNumber": "84", "name": "JasPer License", "licenseId": "JasPer-2.0", "seeAlso": [ @@ -2506,7 +2724,7 @@ "reference": "./LAL-1.2.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LAL-1.2.json", - "referenceNumber": "159", + "referenceNumber": "163", "name": "Licence Art Libre 1.2", "licenseId": "LAL-1.2", "seeAlso": [ @@ -2518,7 +2736,7 @@ "reference": "./LAL-1.3.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LAL-1.3.json", - "referenceNumber": "368", + "referenceNumber": "387", "name": "Licence Art Libre 1.3", "licenseId": "LAL-1.3", "seeAlso": [ @@ -2530,7 +2748,7 @@ "reference": "./LGPL-2.0.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/LGPL-2.0.json", - "referenceNumber": "286", + "referenceNumber": "299", "name": "GNU Library General Public License v2 only", "licenseId": "LGPL-2.0", "seeAlso": [ @@ -2542,7 +2760,7 @@ "reference": "./LGPL-2.0+.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/LGPL-2.0+.json", - "referenceNumber": "144", + "referenceNumber": "148", "name": "GNU Library General Public License v2 or later", "licenseId": "LGPL-2.0+", "seeAlso": [ @@ -2554,7 +2772,7 @@ "reference": "./LGPL-2.0-only.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LGPL-2.0-only.json", - "referenceNumber": "339", + "referenceNumber": "356", "name": "GNU Library General Public License v2 only", "licenseId": "LGPL-2.0-only", "seeAlso": [ @@ -2566,7 +2784,7 @@ "reference": "./LGPL-2.0-or-later.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LGPL-2.0-or-later.json", - "referenceNumber": "35", + "referenceNumber": "36", "name": "GNU Library General Public License v2 or later", "licenseId": "LGPL-2.0-or-later", "seeAlso": [ @@ -2579,7 +2797,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LGPL-2.1.json", - "referenceNumber": "189", + "referenceNumber": "197", "name": "GNU Lesser General Public License v2.1 only", "licenseId": "LGPL-2.1", "seeAlso": [ @@ -2593,7 +2811,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LGPL-2.1+.json", - "referenceNumber": "209", + "referenceNumber": "219", "name": "GNU Library General Public License v2.1 or later", "licenseId": "LGPL-2.1+", "seeAlso": [ @@ -2607,7 +2825,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LGPL-2.1-only.json", - "referenceNumber": "143", + "referenceNumber": "147", "name": "GNU Lesser General Public License v2.1 only", "licenseId": "LGPL-2.1-only", "seeAlso": [ @@ -2621,7 +2839,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LGPL-2.1-or-later.json", - "referenceNumber": "279", + "referenceNumber": "292", "name": "GNU Lesser General Public License v2.1 or later", "licenseId": "LGPL-2.1-or-later", "seeAlso": [ @@ -2635,7 +2853,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LGPL-3.0.json", - "referenceNumber": "216", + "referenceNumber": "226", "name": "GNU Lesser General Public License v3.0 only", "licenseId": "LGPL-3.0", "seeAlso": [ @@ -2649,7 +2867,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LGPL-3.0+.json", - "referenceNumber": "228", + "referenceNumber": "239", "name": "GNU Lesser General Public License v3.0 or later", "licenseId": "LGPL-3.0+", "seeAlso": [ @@ -2663,7 +2881,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LGPL-3.0-only.json", - "referenceNumber": "49", + "referenceNumber": "51", "name": "GNU Lesser General Public License v3.0 only", "licenseId": "LGPL-3.0-only", "seeAlso": [ @@ -2677,7 +2895,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LGPL-3.0-or-later.json", - "referenceNumber": "328", + "referenceNumber": "345", "name": "GNU Lesser General Public License v3.0 or later", "licenseId": "LGPL-3.0-or-later", "seeAlso": [ @@ -2690,7 +2908,7 @@ "reference": "./LGPLLR.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LGPLLR.json", - "referenceNumber": "417", + "referenceNumber": "437", "name": "Lesser General Public License For Linguistic Resources", "licenseId": "LGPLLR", "seeAlso": [ @@ -2702,7 +2920,7 @@ "reference": "./LPL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LPL-1.0.json", - "referenceNumber": "383", + "referenceNumber": "402", "name": "Lucent Public License Version 1.0", "licenseId": "LPL-1.0", "seeAlso": [ @@ -2715,7 +2933,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LPL-1.02.json", - "referenceNumber": "125", + "referenceNumber": "129", "name": "Lucent Public License v1.02", "licenseId": "LPL-1.02", "seeAlso": [ @@ -2728,7 +2946,7 @@ "reference": "./LPPL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LPPL-1.0.json", - "referenceNumber": "86", + "referenceNumber": "90", "name": "LaTeX Project Public License v1.0", "licenseId": "LPPL-1.0", "seeAlso": [ @@ -2740,7 +2958,7 @@ "reference": "./LPPL-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LPPL-1.1.json", - "referenceNumber": "174", + "referenceNumber": "179", "name": "LaTeX Project Public License v1.1", "licenseId": "LPPL-1.1", "seeAlso": [ @@ -2753,7 +2971,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LPPL-1.2.json", - "referenceNumber": "166", + "referenceNumber": "171", "name": "LaTeX Project Public License v1.2", "licenseId": "LPPL-1.2", "seeAlso": [ @@ -2766,7 +2984,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/LPPL-1.3a.json", - "referenceNumber": "280", + "referenceNumber": "293", "name": "LaTeX Project Public License v1.3a", "licenseId": "LPPL-1.3a", "seeAlso": [ @@ -2778,7 +2996,7 @@ "reference": "./LPPL-1.3c.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LPPL-1.3c.json", - "referenceNumber": "131", + "referenceNumber": "135", "name": "LaTeX Project Public License v1.3c", "licenseId": "LPPL-1.3c", "seeAlso": [ @@ -2791,7 +3009,7 @@ "reference": "./Latex2e.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Latex2e.json", - "referenceNumber": "37", + "referenceNumber": "38", "name": "Latex2e License", "licenseId": "Latex2e", "seeAlso": [ @@ -2803,7 +3021,7 @@ "reference": "./Leptonica.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Leptonica.json", - "referenceNumber": "311", + "referenceNumber": "328", "name": "Leptonica License", "licenseId": "Leptonica", "seeAlso": [ @@ -2815,7 +3033,7 @@ "reference": "./LiLiQ-P-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LiLiQ-P-1.1.json", - "referenceNumber": "83", + "referenceNumber": "87", "name": "Licence Libre du Québec – Permissive version 1.1", "licenseId": "LiLiQ-P-1.1", "seeAlso": [ @@ -2828,7 +3046,7 @@ "reference": "./LiLiQ-R-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LiLiQ-R-1.1.json", - "referenceNumber": "301", + "referenceNumber": "315", "name": "Licence Libre du Québec – Réciprocité version 1.1", "licenseId": "LiLiQ-R-1.1", "seeAlso": [ @@ -2841,7 +3059,7 @@ "reference": "./LiLiQ-Rplus-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/LiLiQ-Rplus-1.1.json", - "referenceNumber": "346", + "referenceNumber": "363", "name": "Licence Libre du Québec – Réciprocité forte version 1.1", "licenseId": "LiLiQ-Rplus-1.1", "seeAlso": [ @@ -2854,7 +3072,7 @@ "reference": "./Libpng.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Libpng.json", - "referenceNumber": "388", + "referenceNumber": "407", "name": "libpng License", "licenseId": "Libpng", "seeAlso": [ @@ -2866,7 +3084,7 @@ "reference": "./Linux-OpenIB.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Linux-OpenIB.json", - "referenceNumber": "224", + "referenceNumber": "234", "name": "Linux Kernel Variant of OpenIB.org license", "licenseId": "Linux-OpenIB", "seeAlso": [ @@ -2879,7 +3097,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/MIT.json", - "referenceNumber": "265", + "referenceNumber": "277", "name": "MIT License", "licenseId": "MIT", "seeAlso": [ @@ -2891,7 +3109,7 @@ "reference": "./MIT-0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MIT-0.json", - "referenceNumber": "79", + "referenceNumber": "82", "name": "MIT No Attribution", "licenseId": "MIT-0", "seeAlso": [ @@ -2905,7 +3123,7 @@ "reference": "./MIT-CMU.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MIT-CMU.json", - "referenceNumber": "355", + "referenceNumber": "373", "name": "CMU License", "licenseId": "MIT-CMU", "seeAlso": [ @@ -2918,7 +3136,7 @@ "reference": "./MIT-advertising.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MIT-advertising.json", - "referenceNumber": "199", + "referenceNumber": "209", "name": "Enlightenment License (e16)", "licenseId": "MIT-advertising", "seeAlso": [ @@ -2930,7 +3148,7 @@ "reference": "./MIT-enna.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MIT-enna.json", - "referenceNumber": "54", + "referenceNumber": "57", "name": "enna License", "licenseId": "MIT-enna", "seeAlso": [ @@ -2942,7 +3160,7 @@ "reference": "./MIT-feh.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MIT-feh.json", - "referenceNumber": "376", + "referenceNumber": "395", "name": "feh License", "licenseId": "MIT-feh", "seeAlso": [ @@ -2954,7 +3172,7 @@ "reference": "./MITNFA.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MITNFA.json", - "referenceNumber": "347", + "referenceNumber": "364", "name": "MIT +no-false-attribs license", "licenseId": "MITNFA", "seeAlso": [ @@ -2966,7 +3184,7 @@ "reference": "./MPL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MPL-1.0.json", - "referenceNumber": "247", + "referenceNumber": "259", "name": "Mozilla Public License 1.0", "licenseId": "MPL-1.0", "seeAlso": [ @@ -2980,7 +3198,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/MPL-1.1.json", - "referenceNumber": "407", + "referenceNumber": "426", "name": "Mozilla Public License 1.1", "licenseId": "MPL-1.1", "seeAlso": [ @@ -2994,7 +3212,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/MPL-2.0.json", - "referenceNumber": "126", + "referenceNumber": "130", "name": "Mozilla Public License 2.0", "licenseId": "MPL-2.0", "seeAlso": [ @@ -3007,7 +3225,7 @@ "reference": "./MPL-2.0-no-copyleft-exception.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MPL-2.0-no-copyleft-exception.json", - "referenceNumber": "190", + "referenceNumber": "198", "name": "Mozilla Public License 2.0 (no copyleft exception)", "licenseId": "MPL-2.0-no-copyleft-exception", "seeAlso": [ @@ -3021,7 +3239,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/MS-PL.json", - "referenceNumber": "377", + "referenceNumber": "396", "name": "Microsoft Public License", "licenseId": "MS-PL", "seeAlso": [ @@ -3048,7 +3266,7 @@ "reference": "./MTLL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MTLL.json", - "referenceNumber": "106", + "referenceNumber": "110", "name": "Matrix Template Library License", "licenseId": "MTLL", "seeAlso": [ @@ -3060,7 +3278,7 @@ "reference": "./MakeIndex.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MakeIndex.json", - "referenceNumber": "354", + "referenceNumber": "372", "name": "MakeIndex License", "licenseId": "MakeIndex", "seeAlso": [ @@ -3072,7 +3290,7 @@ "reference": "./MirOS.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MirOS.json", - "referenceNumber": "381", + "referenceNumber": "400", "name": "The MirOS Licence", "licenseId": "MirOS", "seeAlso": [ @@ -3084,7 +3302,7 @@ "reference": "./Motosoto.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Motosoto.json", - "referenceNumber": "12", + "referenceNumber": "13", "name": "Motosoto License", "licenseId": "Motosoto", "seeAlso": [ @@ -3096,7 +3314,7 @@ "reference": "./MulanPSL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MulanPSL-1.0.json", - "referenceNumber": "208", + "referenceNumber": "218", "name": "Mulan Permissive Software License, Version 1", "licenseId": "MulanPSL-1.0", "seeAlso": [ @@ -3109,7 +3327,7 @@ "reference": "./MulanPSL-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/MulanPSL-2.0.json", - "referenceNumber": "153", + "referenceNumber": "157", "name": "Mulan Permissive Software License, Version 2", "licenseId": "MulanPSL-2.0", "seeAlso": [ @@ -3121,7 +3339,7 @@ "reference": "./Multics.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Multics.json", - "referenceNumber": "170", + "referenceNumber": "175", "name": "Multics License", "licenseId": "Multics", "seeAlso": [ @@ -3133,7 +3351,7 @@ "reference": "./Mup.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Mup.json", - "referenceNumber": "316", + "referenceNumber": "333", "name": "Mup License", "licenseId": "Mup", "seeAlso": [ @@ -3145,7 +3363,7 @@ "reference": "./NASA-1.3.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NASA-1.3.json", - "referenceNumber": "114", + "referenceNumber": "118", "name": "NASA Open Source Agreement 1.3", "licenseId": "NASA-1.3", "seeAlso": [ @@ -3158,7 +3376,7 @@ "reference": "./NBPL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NBPL-1.0.json", - "referenceNumber": "17", + "referenceNumber": "18", "name": "Net Boolean Public License v1", "licenseId": "NBPL-1.0", "seeAlso": [ @@ -3170,7 +3388,7 @@ "reference": "./NCGL-UK-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NCGL-UK-2.0.json", - "referenceNumber": "225", + "referenceNumber": "235", "name": "Non-Commercial Government Licence", "licenseId": "NCGL-UK-2.0", "seeAlso": [ @@ -3183,7 +3401,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/NCSA.json", - "referenceNumber": "194", + "referenceNumber": "202", "name": "University of Illinois/NCSA Open Source License", "licenseId": "NCSA", "seeAlso": [ @@ -3196,7 +3414,7 @@ "reference": "./NGPL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NGPL.json", - "referenceNumber": "319", + "referenceNumber": "336", "name": "Nethack General Public License", "licenseId": "NGPL", "seeAlso": [ @@ -3205,10 +3423,36 @@ "isOsiApproved": true }, { + "reference": "./NIST-PD.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/NIST-PD.json", + "referenceNumber": "320", + "name": "NIST Public Domain Notice", + "licenseId": "NIST-PD", + "seeAlso": [ + "https://github.com/tcheneau/simpleRPL/blob/e645e69e38dd4e3ccfeceb2db8cba05b7c2e0cd3/LICENSE.txt", + "https://github.com/tcheneau/Routing/blob/f09f46fcfe636107f22f2c98348188a65a135d98/README.md" + ], + "isOsiApproved": false + }, + { + "reference": "./NIST-PD-fallback.html", + "isDeprecatedLicenseId": false, + "detailsUrl": "http://spdx.org/licenses/NIST-PD-fallback.json", + "referenceNumber": "39", + "name": "NIST Public Domain Notice with license fallback", + "licenseId": "NIST-PD-fallback", + "seeAlso": [ + "https://github.com/usnistgov/jsip/blob/59700e6926cbe96c5cdae897d9a7d2656b42abe3/LICENSE", + "https://github.com/usnistgov/fipy/blob/86aaa5c2ba2c6f1be19593c5986071cf6568cc34/LICENSE.rst" + ], + "isOsiApproved": false + }, + { "reference": "./NLOD-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NLOD-1.0.json", - "referenceNumber": "139", + "referenceNumber": "143", "name": "Norwegian Licence for Open Government Data", "licenseId": "NLOD-1.0", "seeAlso": [ @@ -3220,7 +3464,7 @@ "reference": "./NLPL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NLPL.json", - "referenceNumber": "317", + "referenceNumber": "334", "name": "No Limit Public License", "licenseId": "NLPL", "seeAlso": [ @@ -3233,7 +3477,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/NOSL.json", - "referenceNumber": "392", + "referenceNumber": "411", "name": "Netizen Open Source License", "licenseId": "NOSL", "seeAlso": [ @@ -3246,7 +3490,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/NPL-1.0.json", - "referenceNumber": "253", + "referenceNumber": "265", "name": "Netscape Public License v1.0", "licenseId": "NPL-1.0", "seeAlso": [ @@ -3259,7 +3503,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/NPL-1.1.json", - "referenceNumber": "422", + "referenceNumber": "442", "name": "Netscape Public License v1.1", "licenseId": "NPL-1.1", "seeAlso": [ @@ -3271,7 +3515,7 @@ "reference": "./NPOSL-3.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NPOSL-3.0.json", - "referenceNumber": "156", + "referenceNumber": "160", "name": "Non-Profit Open Software License 3.0", "licenseId": "NPOSL-3.0", "seeAlso": [ @@ -3283,7 +3527,7 @@ "reference": "./NRL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NRL.json", - "referenceNumber": "105", + "referenceNumber": "109", "name": "NRL License", "licenseId": "NRL", "seeAlso": [ @@ -3295,7 +3539,7 @@ "reference": "./NTP.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NTP.json", - "referenceNumber": "268", + "referenceNumber": "280", "name": "NTP License", "licenseId": "NTP", "seeAlso": [ @@ -3307,7 +3551,7 @@ "reference": "./NTP-0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NTP-0.json", - "referenceNumber": "192", + "referenceNumber": "200", "name": "NTP No Attribution", "licenseId": "NTP-0", "seeAlso": [ @@ -3319,7 +3563,7 @@ "reference": "./Naumen.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Naumen.json", - "referenceNumber": "293", + "referenceNumber": "307", "name": "Naumen Public License", "licenseId": "Naumen", "seeAlso": [ @@ -3331,7 +3575,7 @@ "reference": "./Net-SNMP.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Net-SNMP.json", - "referenceNumber": "288", + "referenceNumber": "301", "name": "Net-SNMP License", "licenseId": "Net-SNMP", "seeAlso": [ @@ -3343,7 +3587,7 @@ "reference": "./NetCDF.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/NetCDF.json", - "referenceNumber": "219", + "referenceNumber": "229", "name": "NetCDF license", "licenseId": "NetCDF", "seeAlso": [ @@ -3355,7 +3599,7 @@ "reference": "./Newsletr.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Newsletr.json", - "referenceNumber": "369", + "referenceNumber": "388", "name": "Newsletr License", "licenseId": "Newsletr", "seeAlso": [ @@ -3368,7 +3612,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Nokia.json", - "referenceNumber": "130", + "referenceNumber": "134", "name": "Nokia Open Source License", "licenseId": "Nokia", "seeAlso": [ @@ -3380,7 +3624,7 @@ "reference": "./Noweb.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Noweb.json", - "referenceNumber": "73", + "referenceNumber": "76", "name": "Noweb License", "licenseId": "Noweb", "seeAlso": [ @@ -3393,7 +3637,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Nunit.json", - "referenceNumber": "91", + "referenceNumber": "95", "name": "Nunit License", "licenseId": "Nunit", "seeAlso": [ @@ -3405,7 +3649,7 @@ "reference": "./O-UDA-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/O-UDA-1.0.json", - "referenceNumber": "48", + "referenceNumber": "50", "name": "Open Use of Data Agreement v1.0", "licenseId": "O-UDA-1.0", "seeAlso": [ @@ -3417,7 +3661,7 @@ "reference": "./OCCT-PL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OCCT-PL.json", - "referenceNumber": "68", + "referenceNumber": "71", "name": "Open CASCADE Technology Public License", "licenseId": "OCCT-PL", "seeAlso": [ @@ -3429,7 +3673,7 @@ "reference": "./OCLC-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OCLC-2.0.json", - "referenceNumber": "352", + "referenceNumber": "370", "name": "OCLC Research Public License 2.0", "licenseId": "OCLC-2.0", "seeAlso": [ @@ -3442,7 +3686,7 @@ "reference": "./ODC-By-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/ODC-By-1.0.json", - "referenceNumber": "393", + "referenceNumber": "412", "name": "Open Data Commons Attribution License v1.0", "licenseId": "ODC-By-1.0", "seeAlso": [ @@ -3455,7 +3699,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/ODbL-1.0.json", - "referenceNumber": "351", + "referenceNumber": "369", "name": "ODC Open Database License v1.0", "licenseId": "ODbL-1.0", "seeAlso": [ @@ -3468,7 +3712,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/OFL-1.0.json", - "referenceNumber": "84", + "referenceNumber": "88", "name": "SIL Open Font License 1.0", "licenseId": "OFL-1.0", "seeAlso": [ @@ -3480,7 +3724,7 @@ "reference": "./OFL-1.0-RFN.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OFL-1.0-RFN.json", - "referenceNumber": "309", + "referenceNumber": "326", "name": "SIL Open Font License 1.0 with Reserved Font Name", "licenseId": "OFL-1.0-RFN", "seeAlso": [ @@ -3492,7 +3736,7 @@ "reference": "./OFL-1.0-no-RFN.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OFL-1.0-no-RFN.json", - "referenceNumber": "74", + "referenceNumber": "77", "name": "SIL Open Font License 1.0 with no Reserved Font Name", "licenseId": "OFL-1.0-no-RFN", "seeAlso": [ @@ -3505,7 +3749,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/OFL-1.1.json", - "referenceNumber": "322", + "referenceNumber": "339", "name": "SIL Open Font License 1.1", "licenseId": "OFL-1.1", "seeAlso": [ @@ -3518,7 +3762,7 @@ "reference": "./OFL-1.1-RFN.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OFL-1.1-RFN.json", - "referenceNumber": "43", + "referenceNumber": "45", "name": "SIL Open Font License 1.1 with Reserved Font Name", "licenseId": "OFL-1.1-RFN", "seeAlso": [ @@ -3531,7 +3775,7 @@ "reference": "./OFL-1.1-no-RFN.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OFL-1.1-no-RFN.json", - "referenceNumber": "246", + "referenceNumber": "258", "name": "SIL Open Font License 1.1 with no Reserved Font Name", "licenseId": "OFL-1.1-no-RFN", "seeAlso": [ @@ -3544,7 +3788,7 @@ "reference": "./OGC-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OGC-1.0.json", - "referenceNumber": "378", + "referenceNumber": "397", "name": "OGC Software License, Version 1.0", "licenseId": "OGC-1.0", "seeAlso": [ @@ -3556,7 +3800,7 @@ "reference": "./OGL-Canada-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OGL-Canada-2.0.json", - "referenceNumber": "357", + "referenceNumber": "375", "name": "Open Government Licence - Canada", "licenseId": "OGL-Canada-2.0", "seeAlso": [ @@ -3568,7 +3812,7 @@ "reference": "./OGL-UK-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OGL-UK-1.0.json", - "referenceNumber": "359", + "referenceNumber": "378", "name": "Open Government Licence v1.0", "licenseId": "OGL-UK-1.0", "seeAlso": [ @@ -3580,7 +3824,7 @@ "reference": "./OGL-UK-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OGL-UK-2.0.json", - "referenceNumber": "13", + "referenceNumber": "14", "name": "Open Government Licence v2.0", "licenseId": "OGL-UK-2.0", "seeAlso": [ @@ -3592,7 +3836,7 @@ "reference": "./OGL-UK-3.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OGL-UK-3.0.json", - "referenceNumber": "21", + "referenceNumber": "22", "name": "Open Government Licence v3.0", "licenseId": "OGL-UK-3.0", "seeAlso": [ @@ -3604,7 +3848,7 @@ "reference": "./OGTSL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OGTSL.json", - "referenceNumber": "26", + "referenceNumber": "27", "name": "Open Group Test Suite License", "licenseId": "OGTSL", "seeAlso": [ @@ -3617,7 +3861,7 @@ "reference": "./OLDAP-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-1.1.json", - "referenceNumber": "57", + "referenceNumber": "60", "name": "Open LDAP Public License v1.1", "licenseId": "OLDAP-1.1", "seeAlso": [ @@ -3629,7 +3873,7 @@ "reference": "./OLDAP-1.2.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-1.2.json", - "referenceNumber": "50", + "referenceNumber": "52", "name": "Open LDAP Public License v1.2", "licenseId": "OLDAP-1.2", "seeAlso": [ @@ -3641,7 +3885,7 @@ "reference": "./OLDAP-1.3.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-1.3.json", - "referenceNumber": "42", + "referenceNumber": "44", "name": "Open LDAP Public License v1.3", "licenseId": "OLDAP-1.3", "seeAlso": [ @@ -3653,7 +3897,7 @@ "reference": "./OLDAP-1.4.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-1.4.json", - "referenceNumber": "52", + "referenceNumber": "54", "name": "Open LDAP Public License v1.4", "licenseId": "OLDAP-1.4", "seeAlso": [ @@ -3665,7 +3909,7 @@ "reference": "./OLDAP-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.0.json", - "referenceNumber": "25", + "referenceNumber": "26", "name": "Open LDAP Public License v2.0 (or possibly 2.0A and 2.0B)", "licenseId": "OLDAP-2.0", "seeAlso": [ @@ -3677,7 +3921,7 @@ "reference": "./OLDAP-2.0.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.0.1.json", - "referenceNumber": "290", + "referenceNumber": "303", "name": "Open LDAP Public License v2.0.1", "licenseId": "OLDAP-2.0.1", "seeAlso": [ @@ -3689,7 +3933,7 @@ "reference": "./OLDAP-2.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.1.json", - "referenceNumber": "413", + "referenceNumber": "433", "name": "Open LDAP Public License v2.1", "licenseId": "OLDAP-2.1", "seeAlso": [ @@ -3701,7 +3945,7 @@ "reference": "./OLDAP-2.2.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.2.json", - "referenceNumber": "329", + "referenceNumber": "346", "name": "Open LDAP Public License v2.2", "licenseId": "OLDAP-2.2", "seeAlso": [ @@ -3713,7 +3957,7 @@ "reference": "./OLDAP-2.2.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.2.1.json", - "referenceNumber": "396", + "referenceNumber": "415", "name": "Open LDAP Public License v2.2.1", "licenseId": "OLDAP-2.2.1", "seeAlso": [ @@ -3725,7 +3969,7 @@ "reference": "./OLDAP-2.2.2.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.2.2.json", - "referenceNumber": "176", + "referenceNumber": "181", "name": "Open LDAP Public License 2.2.2", "licenseId": "OLDAP-2.2.2", "seeAlso": [ @@ -3738,7 +3982,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.3.json", - "referenceNumber": "238", + "referenceNumber": "249", "name": "Open LDAP Public License v2.3", "licenseId": "OLDAP-2.3", "seeAlso": [ @@ -3750,7 +3994,7 @@ "reference": "./OLDAP-2.4.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.4.json", - "referenceNumber": "119", + "referenceNumber": "123", "name": "Open LDAP Public License v2.4", "licenseId": "OLDAP-2.4", "seeAlso": [ @@ -3762,7 +4006,7 @@ "reference": "./OLDAP-2.5.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.5.json", - "referenceNumber": "112", + "referenceNumber": "116", "name": "Open LDAP Public License v2.5", "licenseId": "OLDAP-2.5", "seeAlso": [ @@ -3774,7 +4018,7 @@ "reference": "./OLDAP-2.6.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.6.json", - "referenceNumber": "113", + "referenceNumber": "117", "name": "Open LDAP Public License v2.6", "licenseId": "OLDAP-2.6", "seeAlso": [ @@ -3787,7 +4031,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.7.json", - "referenceNumber": "237", + "referenceNumber": "248", "name": "Open LDAP Public License v2.7", "licenseId": "OLDAP-2.7", "seeAlso": [ @@ -3799,7 +4043,7 @@ "reference": "./OLDAP-2.8.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OLDAP-2.8.json", - "referenceNumber": "261", + "referenceNumber": "273", "name": "Open LDAP Public License v2.8", "licenseId": "OLDAP-2.8", "seeAlso": [ @@ -3811,7 +4055,7 @@ "reference": "./OML.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OML.json", - "referenceNumber": "177", + "referenceNumber": "182", "name": "Open Market License", "licenseId": "OML", "seeAlso": [ @@ -3823,7 +4067,7 @@ "reference": "./OPL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OPL-1.0.json", - "referenceNumber": "349", + "referenceNumber": "367", "name": "Open Public License v1.0", "licenseId": "OPL-1.0", "seeAlso": [ @@ -3836,7 +4080,7 @@ "reference": "./OSET-PL-2.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/OSET-PL-2.1.json", - "referenceNumber": "210", + "referenceNumber": "220", "name": "OSET Public License version 2.1", "licenseId": "OSET-PL-2.1", "seeAlso": [ @@ -3850,7 +4094,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/OSL-1.0.json", - "referenceNumber": "99", + "referenceNumber": "103", "name": "Open Software License 1.0", "licenseId": "OSL-1.0", "seeAlso": [ @@ -3863,7 +4107,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/OSL-1.1.json", - "referenceNumber": "184", + "referenceNumber": "191", "name": "Open Software License 1.1", "licenseId": "OSL-1.1", "seeAlso": [ @@ -3876,7 +4120,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/OSL-2.0.json", - "referenceNumber": "375", + "referenceNumber": "394", "name": "Open Software License 2.0", "licenseId": "OSL-2.0", "seeAlso": [ @@ -3889,7 +4133,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/OSL-2.1.json", - "referenceNumber": "163", + "referenceNumber": "168", "name": "Open Software License 2.1", "licenseId": "OSL-2.1", "seeAlso": [ @@ -3903,7 +4147,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/OSL-3.0.json", - "referenceNumber": "155", + "referenceNumber": "159", "name": "Open Software License 3.0", "licenseId": "OSL-3.0", "seeAlso": [ @@ -3917,7 +4161,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/OpenSSL.json", - "referenceNumber": "87", + "referenceNumber": "91", "name": "OpenSSL License", "licenseId": "OpenSSL", "seeAlso": [ @@ -3929,7 +4173,7 @@ "reference": "./PDDL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/PDDL-1.0.json", - "referenceNumber": "137", + "referenceNumber": "141", "name": "ODC Public Domain Dedication \u0026 License 1.0", "licenseId": "PDDL-1.0", "seeAlso": [ @@ -3941,7 +4185,7 @@ "reference": "./PHP-3.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/PHP-3.0.json", - "referenceNumber": "198", + "referenceNumber": "207", "name": "PHP License v3.0", "licenseId": "PHP-3.0", "seeAlso": [ @@ -3961,13 +4205,13 @@ "seeAlso": [ "http://www.php.net/license/3_01.txt" ], - "isOsiApproved": false + "isOsiApproved": true }, { "reference": "./PSF-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/PSF-2.0.json", - "referenceNumber": "95", + "referenceNumber": "99", "name": "Python Software Foundation License 2.0", "licenseId": "PSF-2.0", "seeAlso": [ @@ -3979,7 +4223,7 @@ "reference": "./Parity-6.0.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Parity-6.0.0.json", - "referenceNumber": "419", + "referenceNumber": "439", "name": "The Parity Public License 6.0.0", "licenseId": "Parity-6.0.0", "seeAlso": [ @@ -3991,7 +4235,7 @@ "reference": "./Parity-7.0.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Parity-7.0.0.json", - "referenceNumber": "404", + "referenceNumber": "423", "name": "The Parity Public License 7.0.0", "licenseId": "Parity-7.0.0", "seeAlso": [ @@ -4003,7 +4247,7 @@ "reference": "./Plexus.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Plexus.json", - "referenceNumber": "162", + "referenceNumber": "166", "name": "Plexus Classworlds License", "licenseId": "Plexus", "seeAlso": [ @@ -4015,7 +4259,7 @@ "reference": "./PolyForm-Noncommercial-1.0.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/PolyForm-Noncommercial-1.0.0.json", - "referenceNumber": "292", + "referenceNumber": "306", "name": "PolyForm Noncommercial License 1.0.0", "licenseId": "PolyForm-Noncommercial-1.0.0", "seeAlso": [ @@ -4027,7 +4271,7 @@ "reference": "./PolyForm-Small-Business-1.0.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/PolyForm-Small-Business-1.0.0.json", - "referenceNumber": "122", + "referenceNumber": "126", "name": "PolyForm Small Business License 1.0.0", "licenseId": "PolyForm-Small-Business-1.0.0", "seeAlso": [ @@ -4039,7 +4283,7 @@ "reference": "./PostgreSQL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/PostgreSQL.json", - "referenceNumber": "11", + "referenceNumber": "12", "name": "PostgreSQL License", "licenseId": "PostgreSQL", "seeAlso": [ @@ -4053,7 +4297,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Python-2.0.json", - "referenceNumber": "406", + "referenceNumber": "425", "name": "Python License 2.0", "licenseId": "Python-2.0", "seeAlso": [ @@ -4066,7 +4310,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/QPL-1.0.json", - "referenceNumber": "300", + "referenceNumber": "314", "name": "Q Public License 1.0", "licenseId": "QPL-1.0", "seeAlso": [ @@ -4079,7 +4323,7 @@ "reference": "./Qhull.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Qhull.json", - "referenceNumber": "129", + "referenceNumber": "133", "name": "Qhull License", "licenseId": "Qhull", "seeAlso": [ @@ -4091,7 +4335,7 @@ "reference": "./RHeCos-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/RHeCos-1.1.json", - "referenceNumber": "64", + "referenceNumber": "67", "name": "Red Hat eCos Public License v1.1", "licenseId": "RHeCos-1.1", "seeAlso": [ @@ -4103,7 +4347,7 @@ "reference": "./RPL-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/RPL-1.1.json", - "referenceNumber": "223", + "referenceNumber": "233", "name": "Reciprocal Public License 1.1", "licenseId": "RPL-1.1", "seeAlso": [ @@ -4115,7 +4359,7 @@ "reference": "./RPL-1.5.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/RPL-1.5.json", - "referenceNumber": "109", + "referenceNumber": "113", "name": "Reciprocal Public License 1.5", "licenseId": "RPL-1.5", "seeAlso": [ @@ -4128,7 +4372,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/RPSL-1.0.json", - "referenceNumber": "55", + "referenceNumber": "58", "name": "RealNetworks Public Source License v1.0", "licenseId": "RPSL-1.0", "seeAlso": [ @@ -4141,8 +4385,8 @@ "reference": "./RSA-MD.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/RSA-MD.json", - "referenceNumber": "289", - "name": "RSA Message-Digest License ", + "referenceNumber": "302", + "name": "RSA Message-Digest License", "licenseId": "RSA-MD", "seeAlso": [ "http://www.faqs.org/rfcs/rfc1321.html" @@ -4153,7 +4397,7 @@ "reference": "./RSCPL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/RSCPL.json", - "referenceNumber": "350", + "referenceNumber": "368", "name": "Ricoh Source Code Public License", "licenseId": "RSCPL", "seeAlso": [ @@ -4166,7 +4410,7 @@ "reference": "./Rdisc.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Rdisc.json", - "referenceNumber": "333", + "referenceNumber": "350", "name": "Rdisc License", "licenseId": "Rdisc", "seeAlso": [ @@ -4179,7 +4423,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Ruby.json", - "referenceNumber": "14", + "referenceNumber": "15", "name": "Ruby License", "licenseId": "Ruby", "seeAlso": [ @@ -4191,7 +4435,7 @@ "reference": "./SAX-PD.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SAX-PD.json", - "referenceNumber": "158", + "referenceNumber": "162", "name": "Sax Public Domain Notice", "licenseId": "SAX-PD", "seeAlso": [ @@ -4203,7 +4447,7 @@ "reference": "./SCEA.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SCEA.json", - "referenceNumber": "142", + "referenceNumber": "146", "name": "SCEA Shared Source License", "licenseId": "SCEA", "seeAlso": [ @@ -4215,7 +4459,7 @@ "reference": "./SGI-B-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SGI-B-1.0.json", - "referenceNumber": "196", + "referenceNumber": "204", "name": "SGI Free Software License B v1.0", "licenseId": "SGI-B-1.0", "seeAlso": [ @@ -4227,7 +4471,7 @@ "reference": "./SGI-B-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SGI-B-1.1.json", - "referenceNumber": "299", + "referenceNumber": "313", "name": "SGI Free Software License B v1.1", "licenseId": "SGI-B-1.1", "seeAlso": [ @@ -4240,7 +4484,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/SGI-B-2.0.json", - "referenceNumber": "31", + "referenceNumber": "32", "name": "SGI Free Software License B v2.0", "licenseId": "SGI-B-2.0", "seeAlso": [ @@ -4252,7 +4496,7 @@ "reference": "./SHL-0.5.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SHL-0.5.json", - "referenceNumber": "51", + "referenceNumber": "53", "name": "Solderpad Hardware License v0.5", "licenseId": "SHL-0.5", "seeAlso": [ @@ -4264,7 +4508,7 @@ "reference": "./SHL-0.51.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SHL-0.51.json", - "referenceNumber": "291", + "referenceNumber": "304", "name": "Solderpad Hardware License, Version 0.51", "licenseId": "SHL-0.51", "seeAlso": [ @@ -4277,7 +4521,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/SISSL.json", - "referenceNumber": "82", + "referenceNumber": "86", "name": "Sun Industry Standards Source License v1.1", "licenseId": "SISSL", "seeAlso": [ @@ -4290,7 +4534,7 @@ "reference": "./SISSL-1.2.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SISSL-1.2.json", - "referenceNumber": "65", + "referenceNumber": "68", "name": "Sun Industry Standards Source License v1.2", "licenseId": "SISSL-1.2", "seeAlso": [ @@ -4303,7 +4547,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/SMLNJ.json", - "referenceNumber": "226", + "referenceNumber": "236", "name": "Standard ML of New Jersey License", "licenseId": "SMLNJ", "seeAlso": [ @@ -4315,7 +4559,7 @@ "reference": "./SMPPL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SMPPL.json", - "referenceNumber": "110", + "referenceNumber": "114", "name": "Secure Messaging Protocol Public License", "licenseId": "SMPPL", "seeAlso": [ @@ -4327,7 +4571,7 @@ "reference": "./SNIA.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SNIA.json", - "referenceNumber": "313", + "referenceNumber": "330", "name": "SNIA Public License 1.1", "licenseId": "SNIA", "seeAlso": [ @@ -4340,7 +4584,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/SPL-1.0.json", - "referenceNumber": "256", + "referenceNumber": "268", "name": "Sun Public License v1.0", "licenseId": "SPL-1.0", "seeAlso": [ @@ -4352,7 +4596,7 @@ "reference": "./SSH-OpenSSH.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SSH-OpenSSH.json", - "referenceNumber": "22", + "referenceNumber": "23", "name": "SSH OpenSSH license", "licenseId": "SSH-OpenSSH", "seeAlso": [ @@ -4364,7 +4608,7 @@ "reference": "./SSH-short.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SSH-short.json", - "referenceNumber": "70", + "referenceNumber": "73", "name": "SSH short notice", "licenseId": "SSH-short", "seeAlso": [ @@ -4378,7 +4622,7 @@ "reference": "./SSPL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SSPL-1.0.json", - "referenceNumber": "345", + "referenceNumber": "362", "name": "Server Side Public License, v 1", "licenseId": "SSPL-1.0", "seeAlso": [ @@ -4390,7 +4634,7 @@ "reference": "./SWL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SWL.json", - "referenceNumber": "97", + "referenceNumber": "101", "name": "Scheme Widget Library (SWL) Software License Agreement", "licenseId": "SWL", "seeAlso": [ @@ -4402,7 +4646,7 @@ "reference": "./Saxpath.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Saxpath.json", - "referenceNumber": "34", + "referenceNumber": "35", "name": "Saxpath License", "licenseId": "Saxpath", "seeAlso": [ @@ -4414,7 +4658,7 @@ "reference": "./Sendmail.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Sendmail.json", - "referenceNumber": "304", + "referenceNumber": "318", "name": "Sendmail License", "licenseId": "Sendmail", "seeAlso": [ @@ -4427,7 +4671,7 @@ "reference": "./Sendmail-8.23.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Sendmail-8.23.json", - "referenceNumber": "182", + "referenceNumber": "189", "name": "Sendmail License 8.23", "licenseId": "Sendmail-8.23", "seeAlso": [ @@ -4440,7 +4684,7 @@ "reference": "./SimPL-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SimPL-2.0.json", - "referenceNumber": "259", + "referenceNumber": "271", "name": "Simple Public License 2.0", "licenseId": "SimPL-2.0", "seeAlso": [ @@ -4453,7 +4697,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Sleepycat.json", - "referenceNumber": "58", + "referenceNumber": "61", "name": "Sleepycat License", "licenseId": "Sleepycat", "seeAlso": [ @@ -4465,7 +4709,7 @@ "reference": "./Spencer-86.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Spencer-86.json", - "referenceNumber": "191", + "referenceNumber": "199", "name": "Spencer License 86", "licenseId": "Spencer-86", "seeAlso": [ @@ -4477,7 +4721,7 @@ "reference": "./Spencer-94.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Spencer-94.json", - "referenceNumber": "220", + "referenceNumber": "230", "name": "Spencer License 94", "licenseId": "Spencer-94", "seeAlso": [ @@ -4489,7 +4733,7 @@ "reference": "./Spencer-99.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Spencer-99.json", - "referenceNumber": "67", + "referenceNumber": "70", "name": "Spencer License 99", "licenseId": "Spencer-99", "seeAlso": [ @@ -4502,7 +4746,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/StandardML-NJ.json", - "referenceNumber": "296", + "referenceNumber": "310", "name": "Standard ML of New Jersey License", "licenseId": "StandardML-NJ", "seeAlso": [ @@ -4514,7 +4758,7 @@ "reference": "./SugarCRM-1.1.3.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/SugarCRM-1.1.3.json", - "referenceNumber": "353", + "referenceNumber": "371", "name": "SugarCRM Public License v1.1.3", "licenseId": "SugarCRM-1.1.3", "seeAlso": [ @@ -4526,7 +4770,7 @@ "reference": "./TAPR-OHL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/TAPR-OHL-1.0.json", - "referenceNumber": "9", + "referenceNumber": "10", "name": "TAPR Open Hardware License v1.0", "licenseId": "TAPR-OHL-1.0", "seeAlso": [ @@ -4538,7 +4782,7 @@ "reference": "./TCL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/TCL.json", - "referenceNumber": "56", + "referenceNumber": "59", "name": "TCL/TK License", "licenseId": "TCL", "seeAlso": [ @@ -4551,7 +4795,7 @@ "reference": "./TCP-wrappers.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/TCP-wrappers.json", - "referenceNumber": "242", + "referenceNumber": "253", "name": "TCP Wrappers License", "licenseId": "TCP-wrappers", "seeAlso": [ @@ -4563,7 +4807,7 @@ "reference": "./TMate.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/TMate.json", - "referenceNumber": "415", + "referenceNumber": "435", "name": "TMate Open Source License", "licenseId": "TMate", "seeAlso": [ @@ -4575,7 +4819,7 @@ "reference": "./TORQUE-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/TORQUE-1.1.json", - "referenceNumber": "195", + "referenceNumber": "203", "name": "TORQUE v2.5+ Software License v1.1", "licenseId": "TORQUE-1.1", "seeAlso": [ @@ -4587,7 +4831,7 @@ "reference": "./TOSL.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/TOSL.json", - "referenceNumber": "260", + "referenceNumber": "272", "name": "Trusster Open Source License", "licenseId": "TOSL", "seeAlso": [ @@ -4599,7 +4843,7 @@ "reference": "./TU-Berlin-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/TU-Berlin-1.0.json", - "referenceNumber": "384", + "referenceNumber": "403", "name": "Technische Universitaet Berlin License 1.0", "licenseId": "TU-Berlin-1.0", "seeAlso": [ @@ -4611,7 +4855,7 @@ "reference": "./TU-Berlin-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/TU-Berlin-2.0.json", - "referenceNumber": "405", + "referenceNumber": "424", "name": "Technische Universitaet Berlin License 2.0", "licenseId": "TU-Berlin-2.0", "seeAlso": [ @@ -4623,7 +4867,7 @@ "reference": "./UCL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/UCL-1.0.json", - "referenceNumber": "302", + "referenceNumber": "316", "name": "Upstream Compatibility License v1.0", "licenseId": "UCL-1.0", "seeAlso": [ @@ -4636,7 +4880,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/UPL-1.0.json", - "referenceNumber": "149", + "referenceNumber": "153", "name": "Universal Permissive License v1.0", "licenseId": "UPL-1.0", "seeAlso": [ @@ -4648,7 +4892,7 @@ "reference": "./Unicode-DFS-2015.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Unicode-DFS-2015.json", - "referenceNumber": "270", + "referenceNumber": "282", "name": "Unicode License Agreement - Data Files and Software (2015)", "licenseId": "Unicode-DFS-2015", "seeAlso": [ @@ -4660,7 +4904,7 @@ "reference": "./Unicode-DFS-2016.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Unicode-DFS-2016.json", - "referenceNumber": "382", + "referenceNumber": "401", "name": "Unicode License Agreement - Data Files and Software (2016)", "licenseId": "Unicode-DFS-2016", "seeAlso": [ @@ -4672,7 +4916,7 @@ "reference": "./Unicode-TOU.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Unicode-TOU.json", - "referenceNumber": "16", + "referenceNumber": "17", "name": "Unicode Terms of Use", "licenseId": "Unicode-TOU", "seeAlso": [ @@ -4685,19 +4929,19 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Unlicense.json", - "referenceNumber": "179", + "referenceNumber": "185", "name": "The Unlicense", "licenseId": "Unlicense", "seeAlso": [ "https://unlicense.org/" ], - "isOsiApproved": false + "isOsiApproved": true }, { "reference": "./VOSTROM.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/VOSTROM.json", - "referenceNumber": "363", + "referenceNumber": "382", "name": "VOSTROM Public License for Open Source", "licenseId": "VOSTROM", "seeAlso": [ @@ -4709,7 +4953,7 @@ "reference": "./VSL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/VSL-1.0.json", - "referenceNumber": "402", + "referenceNumber": "421", "name": "Vovida Software License v1.0", "licenseId": "VSL-1.0", "seeAlso": [ @@ -4722,7 +4966,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Vim.json", - "referenceNumber": "213", + "referenceNumber": "223", "name": "Vim License", "licenseId": "Vim", "seeAlso": [ @@ -4735,7 +4979,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/W3C.json", - "referenceNumber": "111", + "referenceNumber": "115", "name": "W3C Software Notice and License (2002-12-31)", "licenseId": "W3C", "seeAlso": [ @@ -4748,7 +4992,7 @@ "reference": "./W3C-19980720.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/W3C-19980720.json", - "referenceNumber": "276", + "referenceNumber": "288", "name": "W3C Software Notice and License (1998-07-20)", "licenseId": "W3C-19980720", "seeAlso": [ @@ -4760,7 +5004,7 @@ "reference": "./W3C-20150513.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/W3C-20150513.json", - "referenceNumber": "115", + "referenceNumber": "119", "name": "W3C Software Notice and Document License (2015-05-13)", "licenseId": "W3C-20150513", "seeAlso": [ @@ -4773,10 +5017,11 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/WTFPL.json", - "referenceNumber": "20", + "referenceNumber": "21", "name": "Do What The F*ck You Want To Public License", "licenseId": "WTFPL", "seeAlso": [ + "http://www.wtfpl.net/about/", "http://sam.zoy.org/wtfpl/COPYING" ], "isOsiApproved": false @@ -4785,7 +5030,7 @@ "reference": "./Watcom-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Watcom-1.0.json", - "referenceNumber": "146", + "referenceNumber": "150", "name": "Sybase Open Watcom Public License 1.0", "licenseId": "Watcom-1.0", "seeAlso": [ @@ -4797,7 +5042,7 @@ "reference": "./Wsuipa.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Wsuipa.json", - "referenceNumber": "264", + "referenceNumber": "276", "name": "Wsuipa License", "licenseId": "Wsuipa", "seeAlso": [ @@ -4810,7 +5055,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/X11.json", - "referenceNumber": "103", + "referenceNumber": "107", "name": "X11 License", "licenseId": "X11", "seeAlso": [ @@ -4823,7 +5068,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/XFree86-1.1.json", - "referenceNumber": "161", + "referenceNumber": "165", "name": "XFree86 License 1.1", "licenseId": "XFree86-1.1", "seeAlso": [ @@ -4835,7 +5080,7 @@ "reference": "./XSkat.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/XSkat.json", - "referenceNumber": "85", + "referenceNumber": "89", "name": "XSkat License", "licenseId": "XSkat", "seeAlso": [ @@ -4847,7 +5092,7 @@ "reference": "./Xerox.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Xerox.json", - "referenceNumber": "232", + "referenceNumber": "243", "name": "Xerox License", "licenseId": "Xerox", "seeAlso": [ @@ -4859,7 +5104,7 @@ "reference": "./Xnet.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Xnet.json", - "referenceNumber": "324", + "referenceNumber": "341", "name": "X.Net License", "licenseId": "Xnet", "seeAlso": [ @@ -4871,7 +5116,7 @@ "reference": "./YPL-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/YPL-1.0.json", - "referenceNumber": "303", + "referenceNumber": "317", "name": "Yahoo! Public License v1.0", "licenseId": "YPL-1.0", "seeAlso": [ @@ -4884,7 +5129,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/YPL-1.1.json", - "referenceNumber": "40", + "referenceNumber": "42", "name": "Yahoo! Public License v1.1", "licenseId": "YPL-1.1", "seeAlso": [ @@ -4896,7 +5141,7 @@ "reference": "./ZPL-1.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/ZPL-1.1.json", - "referenceNumber": "89", + "referenceNumber": "93", "name": "Zope Public License 1.1", "licenseId": "ZPL-1.1", "seeAlso": [ @@ -4909,7 +5154,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/ZPL-2.0.json", - "referenceNumber": "116", + "referenceNumber": "120", "name": "Zope Public License 2.0", "licenseId": "ZPL-2.0", "seeAlso": [ @@ -4923,7 +5168,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/ZPL-2.1.json", - "referenceNumber": "380", + "referenceNumber": "399", "name": "Zope Public License 2.1", "licenseId": "ZPL-2.1", "seeAlso": [ @@ -4935,7 +5180,7 @@ "reference": "./Zed.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Zed.json", - "referenceNumber": "118", + "referenceNumber": "122", "name": "Zed License", "licenseId": "Zed", "seeAlso": [ @@ -4948,7 +5193,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Zend-2.0.json", - "referenceNumber": "385", + "referenceNumber": "404", "name": "Zend License v2.0", "licenseId": "Zend-2.0", "seeAlso": [ @@ -4961,7 +5206,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Zimbra-1.3.json", - "referenceNumber": "181", + "referenceNumber": "188", "name": "Zimbra Public License v1.3", "licenseId": "Zimbra-1.3", "seeAlso": [ @@ -4973,7 +5218,7 @@ "reference": "./Zimbra-1.4.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/Zimbra-1.4.json", - "referenceNumber": "397", + "referenceNumber": "416", "name": "Zimbra Public License v1.4", "licenseId": "Zimbra-1.4", "seeAlso": [ @@ -4986,7 +5231,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/Zlib.json", - "referenceNumber": "45", + "referenceNumber": "47", "name": "zlib License", "licenseId": "Zlib", "seeAlso": [ @@ -4999,7 +5244,7 @@ "reference": "./blessing.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/blessing.json", - "referenceNumber": "312", + "referenceNumber": "329", "name": "SQLite Blessing", "licenseId": "blessing", "seeAlso": [ @@ -5012,7 +5257,7 @@ "reference": "./bzip2-1.0.5.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/bzip2-1.0.5.json", - "referenceNumber": "193", + "referenceNumber": "201", "name": "bzip2 and libbzip2 License v1.0.5", "licenseId": "bzip2-1.0.5", "seeAlso": [ @@ -5025,7 +5270,7 @@ "reference": "./bzip2-1.0.6.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/bzip2-1.0.6.json", - "referenceNumber": "72", + "referenceNumber": "75", "name": "bzip2 and libbzip2 License v1.0.6", "licenseId": "bzip2-1.0.6", "seeAlso": [ @@ -5038,7 +5283,7 @@ "reference": "./copyleft-next-0.3.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/copyleft-next-0.3.0.json", - "referenceNumber": "323", + "referenceNumber": "340", "name": "copyleft-next 0.3.0", "licenseId": "copyleft-next-0.3.0", "seeAlso": [ @@ -5050,7 +5295,7 @@ "reference": "./copyleft-next-0.3.1.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/copyleft-next-0.3.1.json", - "referenceNumber": "390", + "referenceNumber": "409", "name": "copyleft-next 0.3.1", "licenseId": "copyleft-next-0.3.1", "seeAlso": [ @@ -5062,7 +5307,7 @@ "reference": "./curl.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/curl.json", - "referenceNumber": "325", + "referenceNumber": "342", "name": "curl License", "licenseId": "curl", "seeAlso": [ @@ -5074,7 +5319,7 @@ "reference": "./diffmark.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/diffmark.json", - "referenceNumber": "410", + "referenceNumber": "430", "name": "diffmark license", "licenseId": "diffmark", "seeAlso": [ @@ -5086,7 +5331,7 @@ "reference": "./dvipdfm.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/dvipdfm.json", - "referenceNumber": "19", + "referenceNumber": "20", "name": "dvipdfm License", "licenseId": "dvipdfm", "seeAlso": [ @@ -5099,7 +5344,7 @@ "isDeprecatedLicenseId": true, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/eCos-2.0.json", - "referenceNumber": "282", + "referenceNumber": "295", "name": "eCos license version 2.0", "licenseId": "eCos-2.0", "seeAlso": [ @@ -5111,7 +5356,7 @@ "reference": "./eGenix.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/eGenix.json", - "referenceNumber": "221", + "referenceNumber": "231", "name": "eGenix.com Public License 1.1.0", "licenseId": "eGenix", "seeAlso": [ @@ -5124,7 +5369,7 @@ "reference": "./etalab-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/etalab-2.0.json", - "referenceNumber": "269", + "referenceNumber": "281", "name": "Etalab Open License 2.0", "licenseId": "etalab-2.0", "seeAlso": [ @@ -5137,7 +5382,7 @@ "reference": "./gSOAP-1.3b.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/gSOAP-1.3b.json", - "referenceNumber": "173", + "referenceNumber": "178", "name": "gSOAP Public License v1.3b", "licenseId": "gSOAP-1.3b", "seeAlso": [ @@ -5150,7 +5395,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/gnuplot.json", - "referenceNumber": "395", + "referenceNumber": "414", "name": "gnuplot License", "licenseId": "gnuplot", "seeAlso": [ @@ -5163,7 +5408,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/iMatix.json", - "referenceNumber": "183", + "referenceNumber": "190", "name": "iMatix Standard Function Library Agreement", "licenseId": "iMatix", "seeAlso": [ @@ -5175,7 +5420,7 @@ "reference": "./libpng-2.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/libpng-2.0.json", - "referenceNumber": "107", + "referenceNumber": "111", "name": "PNG Reference Library version 2", "licenseId": "libpng-2.0", "seeAlso": [ @@ -5187,7 +5432,7 @@ "reference": "./libselinux-1.0.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/libselinux-1.0.json", - "referenceNumber": "18", + "referenceNumber": "19", "name": "libselinux public domain notice", "licenseId": "libselinux-1.0", "seeAlso": [ @@ -5199,7 +5444,7 @@ "reference": "./libtiff.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/libtiff.json", - "referenceNumber": "420", + "referenceNumber": "440", "name": "libtiff License", "licenseId": "libtiff", "seeAlso": [ @@ -5211,7 +5456,7 @@ "reference": "./mpich2.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/mpich2.json", - "referenceNumber": "63", + "referenceNumber": "66", "name": "mpich2 License", "licenseId": "mpich2", "seeAlso": [ @@ -5223,7 +5468,7 @@ "reference": "./psfrag.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/psfrag.json", - "referenceNumber": "421", + "referenceNumber": "441", "name": "psfrag License", "licenseId": "psfrag", "seeAlso": [ @@ -5235,7 +5480,7 @@ "reference": "./psutils.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/psutils.json", - "referenceNumber": "287", + "referenceNumber": "300", "name": "psutils License", "licenseId": "psutils", "seeAlso": [ @@ -5247,7 +5492,7 @@ "reference": "./wxWindows.html", "isDeprecatedLicenseId": true, "detailsUrl": "http://spdx.org/licenses/wxWindows.json", - "referenceNumber": "252", + "referenceNumber": "264", "name": "wxWindows Library License", "licenseId": "wxWindows", "seeAlso": [ @@ -5260,7 +5505,7 @@ "isDeprecatedLicenseId": false, "isFsfLibre": true, "detailsUrl": "http://spdx.org/licenses/xinetd.json", - "referenceNumber": "412", + "referenceNumber": "432", "name": "xinetd License", "licenseId": "xinetd", "seeAlso": [ @@ -5272,7 +5517,7 @@ "reference": "./xpp.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/xpp.json", - "referenceNumber": "100", + "referenceNumber": "104", "name": "XPP License", "licenseId": "xpp", "seeAlso": [ @@ -5284,7 +5529,7 @@ "reference": "./zlib-acknowledgement.html", "isDeprecatedLicenseId": false, "detailsUrl": "http://spdx.org/licenses/zlib-acknowledgement.json", - "referenceNumber": "254", + "referenceNumber": "266", "name": "zlib/libpng License with Acknowledgement", "licenseId": "zlib-acknowledgement", "seeAlso": [ @@ -5293,5 +5538,5 @@ "isOsiApproved": false } ], - "releaseDate": "2020-05-15" + "releaseDate": "2020-08-03" }
\ No newline at end of file diff --git a/spec/fixtures/dotnet/nuget-csproj/Program.cs b/spec/fixtures/dotnet/nuget-csproj/Program.cs new file mode 100644 index 0000000..9e98aa4 --- /dev/null +++ b/spec/fixtures/dotnet/nuget-csproj/Program.cs @@ -0,0 +1,12 @@ +using System; + +namespace nuget_csproj +{ + class Program + { + static void Main(string[] args) + { + Console.WriteLine("Hello World!"); + } + } +} diff --git a/spec/fixtures/dotnet/nuget-csproj/nuget-csproj.csproj b/spec/fixtures/dotnet/nuget-csproj/nuget-csproj.csproj new file mode 100644 index 0000000..7bdb8cc --- /dev/null +++ b/spec/fixtures/dotnet/nuget-csproj/nuget-csproj.csproj @@ -0,0 +1,7 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>netcoreapp3.1</TargetFramework> + <RootNamespace>nuget_csproj</RootNamespace> + </PropertyGroup> +</Project> diff --git a/spec/fixtures/expected/js/bower/v2.1.json b/spec/fixtures/expected/js/bower/v2.1.json index 78a4a05..b1a140a 100644 --- a/spec/fixtures/expected/js/bower/v2.1.json +++ b/spec/fixtures/expected/js/bower/v2.1.json @@ -35,7 +35,7 @@ "dependencies": [ { "name": "cli", - "version": "6.14.7", + "version": "6.14.8", "package_manager": "bower", "path": "bower.json", "licenses": [ @@ -137,4 +137,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/spec/fixtures/java/maven/java-version/.java-version b/spec/fixtures/java/maven/java-version/.java-version new file mode 100644 index 0000000..be6dcc8 --- /dev/null +++ b/spec/fixtures/java/maven/java-version/.java-version @@ -0,0 +1 @@ +java-version diff --git a/spec/fixtures/java/maven/tool-versions/.tool-versions b/spec/fixtures/java/maven/tool-versions/.tool-versions new file mode 100644 index 0000000..ecf6810 --- /dev/null +++ b/spec/fixtures/java/maven/tool-versions/.tool-versions @@ -0,0 +1 @@ +java tool-versions diff --git a/spec/fixtures/js/10.21.0-tool-versions/.tool-versions b/spec/fixtures/js/10.21.0-tool-versions/.tool-versions new file mode 100644 index 0000000..d5c42e2 --- /dev/null +++ b/spec/fixtures/js/10.21.0-tool-versions/.tool-versions @@ -0,0 +1 @@ +nodejs 10.21.0 diff --git a/spec/fixtures/python/pip/requirements/requirements.txt b/spec/fixtures/python/pip/requirements/requirements.txt new file mode 100644 index 0000000..11b4935 --- /dev/null +++ b/spec/fixtures/python/pip/requirements/requirements.txt @@ -0,0 +1 @@ +beets==1.4.9 diff --git a/spec/fixtures/python/simple-Pipfile b/spec/fixtures/python/pipenv/simple/Pipfile index 2a4ffeb..2a4ffeb 100644 --- a/spec/fixtures/python/simple-Pipfile +++ b/spec/fixtures/python/pipenv/simple/Pipfile diff --git a/spec/fixtures/python/simple-Pipfile.lock b/spec/fixtures/python/pipenv/simple/Pipfile.lock index 655ee42..655ee42 100644 --- a/spec/fixtures/python/simple-Pipfile.lock +++ b/spec/fixtures/python/pipenv/simple/Pipfile.lock diff --git a/spec/fixtures/python/pipenv/specific-python-version/.tool-versions b/spec/fixtures/python/pipenv/specific-python-version/.tool-versions new file mode 100644 index 0000000..5f51665 --- /dev/null +++ b/spec/fixtures/python/pipenv/specific-python-version/.tool-versions @@ -0,0 +1 @@ +python 3.4.10 diff --git a/spec/fixtures/python/pipenv/specific-python-version/Pipfile b/spec/fixtures/python/pipenv/specific-python-version/Pipfile new file mode 100644 index 0000000..ba1512c --- /dev/null +++ b/spec/fixtures/python/pipenv/specific-python-version/Pipfile @@ -0,0 +1,14 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] + +[packages] +docutils = "==0.13.1" +Django = "==1.11.3" +requests = "==2.5.3" + +[requires] +python_version = "3.4" diff --git a/spec/fixtures/python/pipenv/specific-python-version/Pipfile.lock b/spec/fixtures/python/pipenv/specific-python-version/Pipfile.lock new file mode 100644 index 0000000..82cfacb --- /dev/null +++ b/spec/fixtures/python/pipenv/specific-python-version/Pipfile.lock @@ -0,0 +1,53 @@ +{ + "_meta": { + "hash": { + "sha256": "1ac44ce43bdf23591652454e72811bc45465877c4a40721707a4a21323e14fb3" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.4" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "django": { + "hashes": [ + "sha256:9ef9de0a957245ed3a29c4162ed2fd493252ca249a755f9e2b4a9be82caf8f6b", + "sha256:c69e0c0416f2376b677830304d4c5fa8793b9c815af77be659a3c50d1f46c2e6" + ], + "index": "pypi", + "version": "==1.11.3" + }, + "docutils": { + "hashes": [ + "sha256:718c0f5fb677be0f34b781e04241c4067cbd9327b66bdd8e763201130f5175be", + "sha256:cb3ebcb09242804f84bdbf0b26504077a054da6772c6f4d625f335cc53ebf94d", + "sha256:de454f1015958450b72641165c08afe7023cd7e3944396448f2fb1b0ccba9d77" + ], + "index": "pypi", + "version": "==0.13.1" + }, + "pytz": { + "hashes": [ + "sha256:26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32", + "sha256:c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7" + ], + "version": "==2019.2" + }, + "requests": { + "hashes": [ + "sha256:3e66d7ba78e7a6a8eccd2e901079ab8d24e408b5375cf32eb51f291306302418", + "sha256:55d7f5619daae94ec49ee81ed8c865e5a2a47f0bbf8e06cf94636bee103eaf65" + ], + "index": "pypi", + "version": "==2.5.3" + } + }, + "develop": {} +} diff --git a/spec/fixtures/ruby/bundler-jruby/.tool-versions b/spec/fixtures/ruby/bundler-jruby/.tool-versions new file mode 100644 index 0000000..e966fd0 --- /dev/null +++ b/spec/fixtures/ruby/bundler-jruby/.tool-versions @@ -0,0 +1,2 @@ +java adoptopenjdk-8.0.252+9.1 +ruby jruby-9.2.11.1 diff --git a/spec/fixtures/ruby/bundler-jruby/Gemfile b/spec/fixtures/ruby/bundler-jruby/Gemfile new file mode 100644 index 0000000..c6e1267 --- /dev/null +++ b/spec/fixtures/ruby/bundler-jruby/Gemfile @@ -0,0 +1,66 @@ +source "https://rubygems.org" + +gem "rails", "5.2.4.3" + +gem "action_subscriber" +gem "action_subscriber-opentracing" +gem "activerecord-import" +gem "active_remote" +gem "aws-sdk-sns" +gem "bcrypt" +gem "pluck_each" +gem "httpclient" +gem "md-logstasher" +gem "protobuf", ">= 3.10.0.pre0" +gem "protobuf-activerecord", ">= 5.2.0" +gem "protobuf-nats" +gem "protobuf-opentracing" +gem "rails-html-sanitizer", "~> 1.0.3" +gem "redis-namespace" +gem "redis-rails" +gem "ruby-saml", "~> 1.2" +gem "sidekiq" +gem "sidekiq-cron" +gem "spectacles" +gem "sprockets", "~>3.7.2" +gem "urlcrypt" +gem "harness" +gem "harness-action_subscriber" +gem "harness-active_publisher" +gem "harness-sidekiq" +gem "trebuchet", :group => :development +gem "rspec-rails", group: [:development, :test] + +platforms :ruby do + gem "pg" +end + +platforms :jruby do + gem "activerecord-jdbcpostgresql-adapter" + gem "protobuf_java_helpers" + gem "fast_blank_java" +end + +group :development, :test do + gem "benchmark-ips", require: false + gem "brakeman", require: false + gem "bundler-audit", require: false + gem "mad_rubocop", require: false + gem "pry" + platforms :jruby do + gem "jruby-profiler-flame_graph_profile_printer", require: false + end +end + +group :test do + gem "factory_bot_rails" + gem "protobuf-rspec" + gem "rspec-pride", require: false + gem "shoulda" + gem "simplecov", require: false + gem "timecop" +end + +group :doc do + gem "sdoc", require: false +end diff --git a/spec/fixtures/ruby/bundler-jruby/Gemfile.lock b/spec/fixtures/ruby/bundler-jruby/Gemfile.lock new file mode 100644 index 0000000..2dedaae --- /dev/null +++ b/spec/fixtures/ruby/bundler-jruby/Gemfile.lock @@ -0,0 +1,362 @@ +GEM + remote: https://rubygems.org/ + specs: + action_subscriber (5.2.1-java) + activesupport (>= 3.2) + concurrent-ruby + march_hare (>= 2.7.0) + middleware + thor + action_subscriber-opentracing (1.0.3) + opentracing + actioncable (5.2.4.3) + actionpack (= 5.2.4.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.4.3) + actionpack (= 5.2.4.3) + actionview (= 5.2.4.3) + activejob (= 5.2.4.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.4.3) + actionview (= 5.2.4.3) + activesupport (= 5.2.4.3) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.4.3) + activesupport (= 5.2.4.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + active_remote (5.2.0) + activemodel (~> 5.2) + activesupport (~> 5.2) + protobuf (>= 3.0) + activejob (5.2.4.3) + activesupport (= 5.2.4.3) + globalid (>= 0.3.6) + activemodel (5.2.4.3) + activesupport (= 5.2.4.3) + activerecord (5.2.4.3) + activemodel (= 5.2.4.3) + activesupport (= 5.2.4.3) + arel (>= 9.0) + activerecord-import (1.0.5) + activerecord (>= 3.2) + activerecord-jdbc-adapter (52.6-java) + activerecord (~> 5.2.0) + activerecord-jdbcpostgresql-adapter (52.6-java) + activerecord-jdbc-adapter (= 52.6) + jdbc-postgres (>= 9.4, < 43) + activestorage (5.2.4.3) + actionpack (= 5.2.4.3) + activerecord (= 5.2.4.3) + marcel (~> 0.3.1) + activesupport (5.2.4.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + arel (9.0.0) + ast (2.4.1) + aws-eventstream (1.1.0) + aws-partitions (1.341.0) + aws-sdk-core (3.103.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-sns (1.28.0) + aws-sdk-core (~> 3, >= 3.99.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.1) + aws-eventstream (~> 1, >= 1.0.2) + bcrypt (3.1.13-java) + benchmark-ips (2.8.2) + brakeman (4.8.2) + builder (3.2.4) + bundler-audit (0.7.0.1) + bundler (>= 1.2.0, < 3) + thor (>= 0.18, < 2) + coderay (1.1.3) + concurrent-ruby (1.1.6) + connection_pool (2.2.3) + crass (1.0.6) + diff-lcs (1.4.4) + docile (1.3.2) + erubi (1.9.0) + et-orbi (1.2.4) + tzinfo + factory_bot (6.1.0) + activesupport (>= 5.0.0) + factory_bot_rails (6.1.0) + factory_bot (~> 6.1.0) + railties (>= 5.0.0) + fast_blank_java (0.0.2-java) + ffi (1.13.1-java) + fugit (1.3.6) + et-orbi (~> 1.1, >= 1.1.8) + raabro (~> 1.3) + globalid (0.4.2) + activesupport (>= 4.2.0) + harness (2.0.0) + statsd-ruby + harness-action_subscriber (0.0.4) + action_subscriber (>= 2.0.0) + activesupport (>= 3.2) + harness (>= 2.0.0) + harness-active_publisher (1.1.3) + activesupport (>= 3.2) + harness (>= 2.0.0) + harness-sidekiq (0.1.0) + harness + sidekiq + heredity (0.1.2) + httpclient (2.8.3) + i18n (1.8.3) + concurrent-ruby (~> 1.0) + jaro_winkler (1.5.4-java) + jdbc-postgres (42.2.14) + jmespath (1.4.0) + jruby-profiler-flame_graph_profile_printer (0.2.0-java) + logstash-event (1.2.02) + loofah (2.6.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mad_rubocop (3.64.0) + rubocop (~> 0.64.0) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + march_hare (4.2.0-java) + md-logstasher (1.2.0) + logstash-event (~> 1.2) + method_source (1.0.0) + middleware (0.1.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + minitest (5.14.1) + nats-pure (0.3.0) + nio4r (2.5.2-java) + nokogiri (1.10.10-java) + opentracing (0.5.0) + parallel (1.19.2) + parser (2.7.1.4) + ast (~> 2.4.1) + pluck_each (0.1.3) + activerecord (> 3.2.0) + activesupport (> 3.0.0) + powerpack (0.1.2) + protobuf (3.10.3) + activesupport (>= 3.2) + middleware + thor + thread_safe + protobuf-activerecord (5.2.0) + activerecord (~> 5.2.0) + activesupport (~> 5.2.0) + concurrent-ruby + heredity (>= 0.1.1) + protobuf (>= 3.0) + protobuf-nats (0.10.2) + activesupport (>= 3.2) + connection_pool + nats-pure (~> 0.3, < 0.4) + protobuf (~> 3.7, >= 3.7.2) + protobuf-opentracing (1.0.7) + activesupport (>= 3.2) + opentracing + protobuf-rspec (1.1.4) + protobuf (>= 3.0.0) + rspec (>= 2.14, < 4.0) + protobuf_java_helpers (0.2.0-java) + pry (0.13.1-java) + coderay (~> 1.1) + method_source (~> 1.0) + spoon (~> 0.0) + raabro (1.3.1) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.4.3) + actioncable (= 5.2.4.3) + actionmailer (= 5.2.4.3) + actionpack (= 5.2.4.3) + actionview (= 5.2.4.3) + activejob (= 5.2.4.3) + activemodel (= 5.2.4.3) + activerecord (= 5.2.4.3) + activestorage (= 5.2.4.3) + activesupport (= 5.2.4.3) + bundler (>= 1.3.0) + railties (= 5.2.4.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.4.3) + actionpack (= 5.2.4.3) + activesupport (= 5.2.4.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rainbow (3.0.0) + rake (13.0.1) + rdoc (6.2.1) + redis (4.2.1) + redis-actionpack (5.2.0) + actionpack (>= 5, < 7) + redis-rack (>= 2.1.0, < 3) + redis-store (>= 1.1.0, < 2) + redis-activesupport (5.2.0) + activesupport (>= 3, < 7) + redis-store (>= 1.3, < 2) + redis-namespace (1.7.0) + redis (>= 3.0.4) + redis-rack (2.1.2) + rack (>= 2.0.8, < 3) + redis-store (>= 1.2, < 2) + redis-rails (5.0.2) + redis-actionpack (>= 5.0, < 6) + redis-activesupport (>= 5.0, < 6) + redis-store (>= 1.2, < 2) + redis-store (1.9.0) + redis (>= 4, < 5) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-pride (3.2.1) + rspec (~> 3.0) + rspec-rails (4.0.1) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.9) + rspec-expectations (~> 3.9) + rspec-mocks (~> 3.9) + rspec-support (~> 3.9) + rspec-support (3.9.3) + rubocop (0.64.0) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.5, != 2.5.1.1) + powerpack (~> 0.1) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.4.0) + ruby-progressbar (1.10.1) + ruby-saml (1.11.0) + nokogiri (>= 1.5.10) + sdoc (1.1.0) + rdoc (>= 5.0) + shoulda (4.0.0) + shoulda-context (~> 2.0) + shoulda-matchers (~> 4.0) + shoulda-context (2.0.0) + shoulda-matchers (4.3.0) + activesupport (>= 4.2.0) + sidekiq (6.1.0) + connection_pool (>= 2.2.2) + rack (~> 2.0) + redis (>= 4.2.0) + sidekiq-cron (1.2.0) + fugit (~> 1.1) + sidekiq (>= 4.2.1) + simplecov (0.18.5) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov-html (0.12.2) + spectacles (2.0.0) + activerecord (>= 3.2.0, < 6.0) + activesupport (>= 3.2.0, < 6.0) + spoon (0.0.6) + ffi + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + statsd-ruby (1.4.0) + thor (1.0.1) + thread_safe (0.3.6-java) + timecop (0.9.1) + trebuchet (0.1) + tzinfo (1.2.7) + thread_safe (~> 0.1) + unicode-display_width (1.4.1) + urlcrypt (0.1.1) + websocket-driver (0.7.3-java) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + +PLATFORMS + java + +DEPENDENCIES + action_subscriber + action_subscriber-opentracing + active_remote + activerecord-import + activerecord-jdbcpostgresql-adapter + aws-sdk-sns + bcrypt + benchmark-ips + brakeman + bundler-audit + factory_bot_rails + fast_blank_java + harness + harness-action_subscriber + harness-active_publisher + harness-sidekiq + httpclient + jruby-profiler-flame_graph_profile_printer + mad_rubocop + md-logstasher + pg + pluck_each + protobuf (>= 3.10.0.pre0) + protobuf-activerecord (>= 5.2.0) + protobuf-nats + protobuf-opentracing + protobuf-rspec + protobuf_java_helpers + pry + rails (= 5.2.4.3) + rails-html-sanitizer (~> 1.0.3) + redis-namespace + redis-rails + rspec-pride + rspec-rails + ruby-saml (~> 1.2) + sdoc + shoulda + sidekiq + sidekiq-cron + simplecov + spectacles + sprockets (~> 3.7.2) + timecop + trebuchet + urlcrypt + +BUNDLED WITH + 2.1.4 diff --git a/spec/fixtures/ruby/bundler/ruby-2.6.0-tool-versions/.tool-versions b/spec/fixtures/ruby/bundler/ruby-2.6.0-tool-versions/.tool-versions new file mode 100644 index 0000000..cf8ec42 --- /dev/null +++ b/spec/fixtures/ruby/bundler/ruby-2.6.0-tool-versions/.tool-versions @@ -0,0 +1 @@ +ruby 2.6.0 diff --git a/spec/integration/c/conan_spec.rb b/spec/integration/c/conan_spec.rb index cdbf029..86025bd 100644 --- a/spec/integration/c/conan_spec.rb +++ b/spec/integration/c/conan_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "conan" do diff --git a/spec/integration/dotnet/examples_spec.rb b/spec/integration/dotnet/examples_spec.rb index f9c63ea..909dd2c 100644 --- a/spec/integration/dotnet/examples_spec.rb +++ b/spec/integration/dotnet/examples_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe ".NET Core" do diff --git a/spec/integration/dotnet/nuget_spec.rb b/spec/integration/dotnet/nuget_spec.rb index 90a189b..5bda5db 100644 --- a/spec/integration/dotnet/nuget_spec.rb +++ b/spec/integration/dotnet/nuget_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "nuget" do diff --git a/spec/integration/go/modules_spec.rb b/spec/integration/go/modules_spec.rb index fa2313c..3edef74 100644 --- a/spec/integration/go/modules_spec.rb +++ b/spec/integration/go/modules_spec.rb @@ -1,9 +1,11 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "modules" do before do # Delete go module cache - system('rm -fr ~/.local/pkg') + system('rm -fr /opt/gitlab/.local/pkg') system('rm -fr /opt/asdf/installs/golang/**/packages/pkg/') end @@ -64,6 +66,21 @@ RSpec.describe "modules" do end end + context "when scanning the `gitlab-runner` project" do + subject { runner.scan } + + before do + runner.clone('https://gitlab.com/gitlab-org/gitlab-runner.git') + end + + specify do + expect(subject).to match_schema + expect(subject[:licenses]).not_to be_empty + expect(subject[:dependencies]).not_to be_empty + expect(subject.dependency_names).to include('gitlab.com/gitlab-org/gitlab-terminal') + end + end + context "when scanning a project with vendored modules" do subject { runner.scan } diff --git a/spec/integration/java/gradle_spec.rb b/spec/integration/java/gradle_spec.rb index c2137b3..25d7e26 100644 --- a/spec/integration/java/gradle_spec.rb +++ b/spec/integration/java/gradle_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "gradle" do @@ -113,17 +115,17 @@ plugins { end context 'when using Java 8 with version 1.* of gradle' do + subject { runner.scan(env: { 'LM_JAVA_VERSION' => '8' }) } + before do runner.mount(dir: fixture_file("java/gradle/java-8")) runner.add_file('.tool-versions', "gradle 1.9") end it 'returns an empty report because the plugin we use does not work in this version of the gradle API' do - report = runner.scan(env: { 'LM_JAVA_VERSION' => '8' }) - - expect(report).to match_schema - expect(report[:dependencies]).to be_empty - expect(report[:licenses]).to be_empty + expect(subject).to match_schema + expect(subject[:dependencies]).to be_empty + expect(subject[:licenses]).to be_empty end end diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb index aa2d1ff..c9a7026 100644 --- a/spec/integration/java/maven_spec.rb +++ b/spec/integration/java/maven_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "maven" do @@ -58,15 +60,15 @@ RSpec.describe "maven" do end describe "When scanning a project with multiple modules" do + subject { runner.scan } + before do runner.mount(dir: fixture_file('java/maven/multimodule')) end it 'detects dependences from each module' do - report = runner.scan - - expect(report).to match_schema - expect(report[:dependencies]).not_to be_empty + expect(subject).to match_schema + expect(subject[:dependencies]).not_to be_empty [ { name: "asm", licenses: ["BSD-4-Clause"] }, @@ -81,10 +83,10 @@ RSpec.describe "maven" do { name: "netty-all", licenses: ["Apache-2.0"] }, { name: "stax2-api", licenses: ["BSD-4-Clause"] } ].each do |dependency| - expect(report.licenses_for(dependency[:name])).to match_array(dependency[:licenses]) + expect(subject.licenses_for(dependency[:name])).to match_array(dependency[:licenses]) end - expect(report.dependency_names).not_to include('junit') + expect(subject.dependency_names).not_to include('junit') end end diff --git a/spec/integration/js/bower_spec.rb b/spec/integration/js/bower_spec.rb index 227718e..1bb366e 100644 --- a/spec/integration/js/bower_spec.rb +++ b/spec/integration/js/bower_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "bower" do diff --git a/spec/integration/js/npm_spec.rb b/spec/integration/js/npm_spec.rb index a8dd2d4..8ab5be6 100644 --- a/spec/integration/js/npm_spec.rb +++ b/spec/integration/js/npm_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "npm" do diff --git a/spec/integration/js/yarn_spec.rb b/spec/integration/js/yarn_spec.rb index d81564c..5b1f9c5 100644 --- a/spec/integration/js/yarn_spec.rb +++ b/spec/integration/js/yarn_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "yarn" do diff --git a/spec/integration/php/composer_spec.rb b/spec/integration/php/composer_spec.rb index 839f0b7..9f71541 100644 --- a/spec/integration/php/composer_spec.rb +++ b/spec/integration/php/composer_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "composer" do diff --git a/spec/integration/python/pip_spec.rb b/spec/integration/python/pip_spec.rb index a52b992..9c2721d 100644 --- a/spec/integration/python/pip_spec.rb +++ b/spec/integration/python/pip_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "pip" do @@ -100,10 +102,20 @@ RSpec.describe "pip" do context "when a project uses a custom `SETUP_CMD`" do before do runner.add_file('requirements.txt', 'six==1.14.0') + runner.add_file('.python-version', '3.8.4') + runner.add_file('custom.sh') do + <<~SCRIPT + #!/bin/bash -lx + + asdf install python 3.8.4 + asdf reshim + pip install -r requirements.txt + SCRIPT + end end it 'detects the software licenses' do - report = runner.scan(env: { 'SETUP_CMD' => 'pip install -r requirements.txt' }) + report = runner.scan(env: { 'SETUP_CMD' => 'bash custom.sh' }) expect(report).to match_schema(version: '2.0') expect(report.licenses_for('six')).to match_array(["MIT"]) diff --git a/spec/integration/python/pipenv_spec.rb b/spec/integration/python/pipenv_spec.rb index 5cc9128..cd20522 100644 --- a/spec/integration/python/pipenv_spec.rb +++ b/spec/integration/python/pipenv_spec.rb @@ -1,6 +1,12 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "pipenv" do + subject { runner.scan(env: env) } + + let(:env) { {} } + include_examples "each report version", "python", "pipenv", "pip-file-lock" context "when a project depends on a version 6 Pipfile.lock" do @@ -19,15 +25,15 @@ RSpec.describe "pipenv" do }) end - it 'produces a valid report' do + before do runner.add_file('Pipfile.lock', pipfile_lock_content) + end - report = runner.scan - - expect(report).to match_schema - expect(report[:version]).not_to be_empty - expect(report[:licenses]).not_to be_empty - expect(report.dependency_names).to contain_exactly("six") + it 'produces a valid report' do + expect(subject).to match_schema + expect(subject[:version]).not_to be_empty + expect(subject[:licenses]).not_to be_empty + expect(subject.dependency_names).to contain_exactly("six") end end @@ -64,15 +70,15 @@ RSpec.describe "pipenv" do }) end - it 'produces a valid report' do + before do runner.add_file('Pipfile.lock', pipfile_lock_content) + end - report = runner.scan - - expect(report).to match_schema - expect(report[:version]).not_to be_empty - expect(report[:licenses]).not_to be_empty - expect(report.dependency_names).to match_array([ + it 'produces a valid report' do + expect(subject).to match_schema + expect(subject[:version]).not_to be_empty + expect(subject[:licenses]).not_to be_empty + expect(subject.dependency_names).to match_array([ "backports.shutil_get_terminal_size", "click", "colorama", @@ -124,15 +130,15 @@ RSpec.describe "pipenv" do }) end - it 'produces a valid report' do + before do runner.add_file('Pipfile.lock', pipfile_lock_content) + end - report = runner.scan - - expect(report).to match_schema - expect(report[:version]).not_to be_empty - expect(report[:licenses]).not_to be_empty - expect(report.dependency_names).to match_array(%w[ + it 'produces a valid report' do + expect(subject).to match_schema + expect(subject[:version]).not_to be_empty + expect(subject[:licenses]).not_to be_empty + expect(subject.dependency_names).to match_array(%w[ certifi chardet idna @@ -163,22 +169,19 @@ RSpec.describe "pipenv" do end it 'produces a valid report' do - report = runner.scan - - expect(report).to match_schema - expect(report[:licenses]).not_to be_empty - expect(report[:dependencies].count).to be(1) - expect(report.find('six')).not_to be_nil + expect(subject).to match_schema + expect(subject[:licenses]).not_to be_empty + expect(subject[:dependencies].count).to be(1) + expect(subject.find('six')).not_to be_nil end end context "when scanning a simple Pipfile project" do - let(:lockfile_content) { fixture_file_content('python/simple-Pipfile.lock') } + let(:lockfile_content) { fixture_file_content('python/pipenv/simple/Pipfile.lock') } let(:lockfile_hash) { JSON.parse(lockfile_content) } before do - runner.add_file('Pipfile', fixture_file_content('python/simple-Pipfile')) - runner.add_file('Pipfile.lock', lockfile_content) + runner.mount(dir: fixture_file('python/pipenv/simple')) end [2, 3].each do |version| @@ -204,6 +207,12 @@ RSpec.describe "pipenv" do context "when connecting to a private package repository with self signed certificate" do let(:index_url) { "https://pypi.test/simple" } + let(:env) do + { + 'ADDITIONAL_CA_CERT_BUNDLE' => x509_certificate('wildcard.test').read, + 'PIP_INDEX_URL' => index_url + } + end before do add_host('pypi.test', '127.0.0.1') @@ -214,13 +223,19 @@ RSpec.describe "pipenv" do end it 'downloads the packages and trusts the certificate' do - report = runner.scan(env: { - 'ADDITIONAL_CA_CERT_BUNDLE' => x509_certificate('wildcard.test').read, - 'PIP_INDEX_URL' => index_url - }) + expect(subject).to match_schema + expect(subject.dependency_names).to include('requests') + end + end + + context "when scanning a project that declares a specific version of python in the lockfile" do + before do + runner.mount(dir: fixture_file('python/pipenv/specific-python-version')) + end - expect(report).to match_schema - expect(report.dependency_names).to include('requests') + specify do + expect(subject).to match_schema + expect(subject.dependency_names).to match_array(%w[Django docutils pytz requests]) end end end diff --git a/spec/integration/ruby/bundler_spec.rb b/spec/integration/ruby/bundler_spec.rb index 30cf776..6cb5543 100644 --- a/spec/integration/ruby/bundler_spec.rb +++ b/spec/integration/ruby/bundler_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "bundler" do @@ -82,8 +84,6 @@ RSpec.describe "bundler" do specify do expect(subject).to match_schema - expect(subject[:licenses]).not_to be_empty - expect(subject[:dependencies]).not_to be_empty expect(subject.dependency_names).to include('rails') expect(subject.dependency_names).to include('vue') end @@ -140,4 +140,24 @@ RSpec.describe "bundler" do expect(subject.licenses_for('spandx')).to match_array(['MIT']) end end + + context "when scanning a jruby project" do + before do + runner.mount(dir: fixture_file('ruby/bundler-jruby')) + end + + pending do + expect(subject).to match_schema + expect(subject[:licenses]).not_to be_empty + expect(subject.dependency_names).not_to include('jruby-profiler-flame_graph_profile_printer') + + expect(subject.dependency_names).to include('activerecord-jdbcpostgresql-adapter') + expect(subject.dependency_names).to include('protobuf_java_helpers') + expect(subject.dependency_names).to include('fast_blank_java') + + expect(subject.licenses_for('activerecord-jdbcpostgresql-adapter')).to match_array(['MIT']) + expect(subject.licenses_for('protobuf_java_helpers')).to match_array(['MIT']) + expect(subject.licenses_for('fast_blank_java')).to match_array(['MIT']) + end + end end diff --git a/spec/integration/rust/cargo_spec.rb b/spec/integration/rust/cargo_spec.rb index 77ad447..3ab010d 100644 --- a/spec/integration/rust/cargo_spec.rb +++ b/spec/integration/rust/cargo_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe "cargo" do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 81f9164..618175b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'simplecov' require 'license/management' diff --git a/spec/support/fixture_file_helper.rb b/spec/support/fixture_file_helper.rb index 313ee35..f21bfee 100644 --- a/spec/support/fixture_file_helper.rb +++ b/spec/support/fixture_file_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module FixtureFileHelper def fixture_file_content(path, data = {}) content = IO.read(fixture_file(path)) diff --git a/spec/support/integration_test_helper.rb b/spec/support/integration_test_helper.rb index 9d28871..ec92fb8 100644 --- a/spec/support/integration_test_helper.rb +++ b/spec/support/integration_test_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module IntegrationTestHelper def runner(*args) @runner ||= ProjectHelper.new(*args) diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb index 9f88bf1..71b6efb 100644 --- a/spec/support/matchers.rb +++ b/spec/support/matchers.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + RSpec::Matchers.define :match_schema do |version: License::Management::Report::DEFAULT_VERSION| def schema_for(version) License::Management.root.join("spec/fixtures/schema/v#{version}.json").to_s diff --git a/spec/support/project_helper.rb b/spec/support/project_helper.rb index 4ae490e..f64df98 100644 --- a/spec/support/project_helper.rb +++ b/spec/support/project_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ProjectHelper attr_reader :project_path diff --git a/spec/support/proxy_helper.rb b/spec/support/proxy_helper.rb index 1f31164..63b3910 100644 --- a/spec/support/proxy_helper.rb +++ b/spec/support/proxy_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ProxyHelper def x509_certificate(host) License::Management.root.join("tmp/#{host}.crt") diff --git a/spec/support/report.rb b/spec/support/report.rb index d6546ae..dca3c96 100644 --- a/spec/support/report.rb +++ b/spec/support/report.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Report attr_reader :report diff --git a/spec/support/shared.rb b/spec/support/shared.rb index 49edd45..298d85d 100644 --- a/spec/support/shared.rb +++ b/spec/support/shared.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + RSpec.shared_examples "each report version" do |language, package_manager, branch = 'master'| ['1.0', '1.1', '2.0', '2.1'].each do |version| context "when generating a `#{version}` report for #{package_manager}" do diff --git a/spec/unit/license/management/report/v2_1_spec.rb b/spec/unit/license/management/report/v2_1_spec.rb index 356648c..b7576df 100644 --- a/spec/unit/license/management/report/v2_1_spec.rb +++ b/spec/unit/license/management/report/v2_1_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + RSpec.describe License::Management::Report::V2_1 do describe "#to_h" do context "when choosing an appropriate url for a license" do diff --git a/spec/unit/license/management/report/v2_spec.rb b/spec/unit/license/management/report/v2_spec.rb index e5a941e..1bcdb16 100644 --- a/spec/unit/license/management/report/v2_spec.rb +++ b/spec/unit/license/management/report/v2_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + RSpec.describe License::Management::Report::V2 do describe "#to_h" do { diff --git a/spec/unit/license/management/repository_spec.rb b/spec/unit/license/management/repository_spec.rb index a391d09..04eb469 100644 --- a/spec/unit/license/management/repository_spec.rb +++ b/spec/unit/license/management/repository_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + RSpec.describe License::Management::Repository do describe "#item_for" do let(:spdx_licenses) { JSON.parse(IO.read('spdx-licenses.json'))['licenses'] } |