Make simple license mappings more strict

plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution-expected-output.yml

@@ -508,9 +508,8 @@ packages:
   declared_licenses:
   - "BSD"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
   description: "Methods to allow using HTML code with CoreText."
   homepage_url: "https://github.com/Cocoanetics/DTCoreText"
   binary_artifact:
@@ -538,9 +537,8 @@ packages:
   declared_licenses:
   - "BSD"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
   description: "Methods to allow using HTML code with CoreText."
   homepage_url: "https://github.com/Cocoanetics/DTCoreText"
   binary_artifact:
@@ -568,9 +566,8 @@ packages:
   declared_licenses:
   - "BSD"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
   description: "Standard toolset classes and categories."
   homepage_url: "https://github.com/Cocoanetics/DTFoundation"
   binary_artifact:
@@ -598,9 +595,8 @@ packages:
   declared_licenses:
   - "BSD"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
   description: "Standard toolset classes and categories."
   homepage_url: "https://github.com/Cocoanetics/DTFoundation"
   binary_artifact:
@@ -628,9 +624,8 @@ packages:
   declared_licenses:
   - "BSD"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
   description: "Standard toolset classes and categories."
   homepage_url: "https://github.com/Cocoanetics/DTFoundation"
   binary_artifact:
@@ -658,9 +653,8 @@ packages:
   declared_licenses:
   - "BSD"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
   description: "Standard toolset classes and categories."
   homepage_url: "https://github.com/Cocoanetics/DTFoundation"
   binary_artifact:
@@ -716,9 +710,8 @@ packages:
   declared_licenses:
   - "BSD"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
   description: "A set of in-app debugging and exploration tools for iOS"
   homepage_url: "https://github.com/Flipboard/FLEX"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/node-modules-expected-output.yml

@@ -300,9 +300,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile-expected-output.yml

@@ -311,9 +311,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/shrinkwrap-expected-output.yml

@@ -300,9 +300,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/shrinkwrap-skip-excluded-scopes-expected-output.yml

@@ -172,9 +172,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/nested-project-expected-output.yml

@@ -335,9 +335,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-expected-output.yml

@@ -311,9 +311,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-skip-excluded-scopes-expected-output.yml

@@ -174,9 +174,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-expected-output.yml

@@ -311,9 +311,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-skip-excluded-scopes-expected-output.yml

@@ -174,9 +174,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-expected-output.yml

@@ -311,9 +311,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-skip-excluded-scopes-expected-output.yml

@@ -174,9 +174,8 @@ packages:
   declared_licenses:
   - "BSD-like"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD-like: "BSD-3-Clause"
+    unmapped:
+    - "BSD-like"
   description: "a CSS selector compiler/engine"
   homepage_url: "https://github.com/fb55/css-select#readme"
   binary_artifact:

plugins/package-managers/python/src/funTest/assets/projects/external/example-python-flask-expected-output.yml

@@ -64,10 +64,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "A microframework based on Werkzeug, Jinja2 and good intentions"
   homepage_url: "http://github.com/pallets/flask/"
   binary_artifact:
@@ -160,10 +159,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "A small but fast and easy to use stand-alone template engine written\
     \ in pure python."
   homepage_url: "http://jinja.pocoo.org/"

plugins/package-managers/python/src/funTest/assets/projects/external/spdx-tools-python-expected-output.yml

@@ -70,9 +70,8 @@ packages:
   declared_licenses:
   - "BSD"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
   description: "Python Lex & Yacc"
   homepage_url: "http://www.dabeaz.com/ply/"
   binary_artifact:

plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-expected-output.yml

@@ -70,10 +70,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "A simple framework for building complex web applications."
   homepage_url: "https://www.palletsprojects.com/p/flask/"
   binary_artifact:
@@ -169,10 +168,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "Safely add untrusted strings to HTML/XML markup."
   homepage_url: "https://www.palletsprojects.com/p/markupsafe/"
   binary_artifact:

plugins/package-managers/python/src/funTest/assets/projects/synthetic/pip-python3-expected-output.yml

@@ -31,10 +31,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "A high-level Python Web framework that encourages rapid development\
     \ and clean, pragmatic design."
   homepage_url: "https://www.djangoproject.com/"

plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-expected-output.yml

@@ -66,10 +66,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "A simple framework for building complex web applications."
   homepage_url: "https://www.palletsprojects.com/p/flask/"
   binary_artifact:
@@ -132,10 +131,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "A small but fast and easy to use stand-alone template engine written\
     \ in pure python."
   homepage_url: "http://jinja.pocoo.org/"
@@ -167,10 +165,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "Safely add untrusted strings to HTML/XML markup."
   homepage_url: "https://www.palletsprojects.com/p/markupsafe/"
   binary_artifact:

plugins/package-managers/python/src/funTest/assets/projects/synthetic/pipenv-python3-expected-output.yml

@@ -30,10 +30,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "A high-level Python Web framework that encourages rapid development\
     \ and clean, pragmatic design."
   homepage_url: "https://www.djangoproject.com/"

plugins/package-managers/python/src/funTest/assets/projects/synthetic/poetry-expected-output.yml

@@ -892,10 +892,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "Module for decorators, wrappers and monkey patching."
   homepage_url: "https://github.com/GrahamDumpleton/wrapt"
   binary_artifact:

plugins/package-managers/python/src/funTest/assets/projects/synthetic/python-inspector-expected-output.yml

@@ -66,10 +66,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "A simple framework for building complex web applications."
   homepage_url: "https://www.palletsprojects.com/p/flask/"
   binary_artifact:
@@ -165,10 +164,9 @@ packages:
   - "BSD"
   - "BSD License"
   declared_licenses_processed:
-    spdx_expression: "BSD-3-Clause"
-    mapped:
-      BSD: "BSD-3-Clause"
-      BSD License: "BSD-3-Clause"
+    unmapped:
+    - "BSD"
+    - "BSD License"
   description: "Safely add untrusted strings to HTML/XML markup."
   homepage_url: "https://www.palletsprojects.com/p/markupsafe/"
   binary_artifact: