Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SpdxDeclaredLicenseMapping: Generally map "/" to "or" #1590

Merged
merged 1 commit into from
Jun 28, 2019
Merged

SpdxDeclaredLicenseMapping: Generally map "/" to "or" #1590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion analyzer/src/funTest/assets/projects/external/git-repo-expected-output.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7097,7 +7097,7 @@ analyzer:
declared_licenses:
- "MIT/X11"
declared_licenses_processed:
spdx_expression: "MIT AND X11"
spdx_expression: "MIT OR X11"
description: "Light-weight option parsing with an argv hash. No optstrings\
\ attached."
homepage_url: "https://github.com/substack/node-optimist"
Expand Down
16 changes: 8 additions & 8 deletions spdx-utils/src/main/kotlin/SpdxDeclaredLicenseMapping.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ object SpdxDeclaredLicenseMapping {
"CDDL License" to CDDL_1_0.toExpression(),
"CDDL or GPL 2 with Classpath Exception" to (CDDL_1_0 or (GPL_2_0_ONLY with CLASSPATH_EXCEPTION_2_0)),
"CDDL or GPLv2 with exceptions" to (CDDL_1_0 or (GPL_2_0_ONLY with CLASSPATH_EXCEPTION_2_0)),
"CDDL v1.0 / GPL v2 dual license" to (CDDL_1_0 and GPL_2_0_ONLY),
"CDDL v1.1 / GPL v2 dual license" to (CDDL_1_0 and GPL_2_0_ONLY),
"CDDL v1.0 / GPL v2 dual license" to (CDDL_1_0 or GPL_2_0_ONLY),
"CDDL v1.1 / GPL v2 dual license" to (CDDL_1_0 or GPL_2_0_ONLY),
"CDDL+GPL" to (CDDL_1_0 and GPL_2_0_ONLY),
"CDDL+GPL License" to (CDDL_1_0 and GPL_2_0_ONLY),
"CDDL+GPLv2" to (CDDL_1_0 and GPL_2_0_ONLY),
"CDDL/GPLv2 dual license" to (CDDL_1_0 and GPL_2_0_ONLY),
"CDDL/GPLv2+CE" to (CDDL_1_0 and (GPL_2_0_ONLY with CLASSPATH_EXCEPTION_2_0)),
"CDDL/GPLv2 dual license" to (CDDL_1_0 or GPL_2_0_ONLY),
"CDDL/GPLv2+CE" to (CDDL_1_0 or (GPL_2_0_ONLY with CLASSPATH_EXCEPTION_2_0)),
"COMMON DEVELOPMENT AND DISTRIBUTION LICENSE" to CDDL_1_0.toExpression(),
"COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0" to CDDL_1_0.toExpression(),
"Common Development and Distribution License" to CDDL_1_0.toExpression(),
Expand Down Expand Up @@ -204,7 +204,7 @@ object SpdxDeclaredLicenseMapping {
"ICU License" to ICU.toExpression(),
"ISC License (ISCL)" to ISC.toExpression(),
"ISC license" to ISC.toExpression(),
"ISC/BSD License" to (ISC and BSD_2_CLAUSE),
"ISC/BSD License" to (ISC or BSD_2_CLAUSE),
"Jython Software License" to PYTHON_2_0.toExpression(),
"Kirkk.com BSD License" to BSD_3_CLAUSE.toExpression(),
"LGPL 2.1" to LGPL_2_1_ONLY.toExpression(),
Expand All @@ -214,7 +214,7 @@ object SpdxDeclaredLicenseMapping {
"LGPL with exceptions or ZPL" to (LGPL_3_0_ONLY or ZPL_2_1),
"LGPL+BSD" to (LGPL_2_1_ONLY and BSD_2_CLAUSE),
"LGPL, version 2.1" to LGPL_2_1_ONLY.toExpression(),
"LGPL/MIT" to (LGPL_3_0_ONLY and MIT),
"LGPL/MIT" to (LGPL_3_0_ONLY or MIT),
"LGPLv3 or later" to LGPL_3_0_OR_LATER.toExpression(),
"Lesser General Public License (LGPL)" to LGPL_2_1_ONLY.toExpression(),
"Lesser General Public License, version 3 or greater" to LGPL_3_0_OR_LATER.toExpression(),
Expand All @@ -231,7 +231,7 @@ object SpdxDeclaredLicenseMapping {
"MIT license" to MIT.toExpression(),
"MIT, 2-clause BSD" to (MIT and BSD_2_CLAUSE),
"MIT/Expat" to MIT.toExpression(),
"MIT/X11" to (MIT and X11),
"MIT/X11" to (MIT or X11),
"MPL 1.1" to MPL_1_1.toExpression(),
"MPL 2.0" to MPL_2_0.toExpression(),
"MPL 2.0 or EPL 1.0" to (MPL_2_0 or EPL_1_0),
Expand All @@ -249,7 +249,7 @@ object SpdxDeclaredLicenseMapping {
"Mozilla Public License version 2.0" to MPL_2_0.toExpression(),
"Mozilla Public License, Version 2.0" to MPL_2_0.toExpression(),
"Mozilla Public License, version 2.0" to MPL_2_0.toExpression(),
"NetBeans CDDL/GPL" to (CDDL_1_0 and GPL_2_0_ONLY),
"NetBeans CDDL/GPL" to (CDDL_1_0 or GPL_2_0_ONLY),
"New BSD" to BSD_3_CLAUSE.toExpression(),
"New BSD License" to BSD_3_CLAUSE.toExpression(),
"New BSD license" to BSD_3_CLAUSE.toExpression(),
Expand Down