diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a341b5ec1b..921762fd42 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -42,15 +42,21 @@ Major API/other changes: - Output Format Version updated to 4.0.0 (major version bump) - Dependency attribute rename: ``is_resolved`` renamed to ``is_pinned`` See https://github.com/nexB/scancode-toolkit/pull/3888 for more details. +- License Match attribute rename: ``spdx_license_expression`` is renamed to + ``license_expression_spdx``. Changes in Output Data Structure: -- The data structure of the JSON output has changed for - dependencies at file level package_data, and at top-level. +- The data structure of the JSON output has changed for: + - dependencies at file level package_data, and at top-level. + - license matches at file level or unique codebase level license detections Note that the change is a modification to the JSON output, so we have a major version bump ``3.2.0`` to ``4.0.0``: - Dependency attribute ``is_resolved`` renamed to ``is_pinned`` + - LicenseMatch attribute ``spdx_license_expression`` renamed to + ``license_expression_spdx`` + - Update link references of ownership from nexB to aboutcode-org See https://github.com/aboutcode-org/scancode-toolkit/issues/3885 diff --git a/src/licensedcode/match.py b/src/licensedcode/match.py index 400e348fe1..8b55832bd5 100644 --- a/src/licensedcode/match.py +++ b/src/licensedcode/match.py @@ -42,8 +42,8 @@ The filter functions are executed in a specific sequence over the list of matches. """ -TRACE = True -TRACE_MERGE = True +TRACE = False +TRACE_MERGE = False TRACE_REFINE = False TRACE_FILTER_FALSE_POSITIVE = False TRACE_FILTER_CONTAINED = False @@ -807,7 +807,7 @@ def to_dict( result = {} result['license_expression'] = self.rule.license_expression - result['spdx_license_expression'] = self.rule.spdx_license_expression() + result['license_expression_spdx'] = self.rule.spdx_license_expression() result['from_file'] = file_path result['start_line'] = self.start_line result['end_line'] = self.end_line diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json index e3193ec530..3500e9ab99 100644 --- a/tests/cluecode/data/plugin_filter_clues/filtered-expected.json +++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "apache-1.1", - "spdx_license_expression": "Apache-1.1", + "license_expression_spdx": "Apache-1.1", "from_file": "LICENSE", "start_line": 7, "end_line": 70, diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json index 1d0522c008..8f3ca9396d 100644 --- a/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json +++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected2.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "pygres-2.2", - "spdx_license_expression": "LicenseRef-scancode-pygres-2.2", + "license_expression_spdx": "LicenseRef-scancode-pygres-2.2", "from_file": "LICENSE2", "start_line": 7, "end_line": 22, diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json index 45102df52a..70a87e5288 100644 --- a/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json +++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected3.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "pcre", - "spdx_license_expression": "LicenseRef-scancode-pcre", + "license_expression_spdx": "LicenseRef-scancode-pcre", "from_file": "LICENSE3", "start_line": 1, "end_line": 47, diff --git a/tests/cluecode/data/plugin_filter_clues/filtered-expected4.json b/tests/cluecode/data/plugin_filter_clues/filtered-expected4.json index cf49348044..82aa876668 100644 --- a/tests/cluecode/data/plugin_filter_clues/filtered-expected4.json +++ b/tests/cluecode/data/plugin_filter_clues/filtered-expected4.json @@ -164,7 +164,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus OR artistic-1.0", - "spdx_license_expression": "GPL-1.0-or-later OR Artistic-1.0", + "license_expression_spdx": "GPL-1.0-or-later OR Artistic-1.0", "from_file": "LICENSE4", "start_line": 3, "end_line": 11, @@ -178,7 +178,7 @@ }, { "license_expression": "gpl-1.0", - "spdx_license_expression": "GPL-1.0-only", + "license_expression_spdx": "GPL-1.0-only", "from_file": "LICENSE4", "start_line": 13, "end_line": 13, @@ -192,7 +192,7 @@ }, { "license_expression": "gpl-1.0", - "spdx_license_expression": "GPL-1.0-only", + "license_expression_spdx": "GPL-1.0-only", "from_file": "LICENSE4", "start_line": 17, "end_line": 19, @@ -206,7 +206,7 @@ }, { "license_expression": "gpl-1.0", - "spdx_license_expression": "GPL-1.0-only", + "license_expression_spdx": "GPL-1.0-only", "from_file": "LICENSE4", "start_line": 21, "end_line": 270, @@ -220,7 +220,7 @@ }, { "license_expression": "artistic-1.0", - "spdx_license_expression": "Artistic-1.0", + "license_expression_spdx": "Artistic-1.0", "from_file": "LICENSE4", "start_line": 273, "end_line": 273, @@ -234,7 +234,7 @@ }, { "license_expression": "artistic-1.0", - "spdx_license_expression": "Artistic-1.0", + "license_expression_spdx": "Artistic-1.0", "from_file": "LICENSE4", "start_line": 277, "end_line": 279, @@ -248,7 +248,7 @@ }, { "license_expression": "artistic-1.0", - "spdx_license_expression": "Artistic-1.0", + "license_expression_spdx": "Artistic-1.0", "from_file": "LICENSE4", "start_line": 281, "end_line": 281, @@ -262,7 +262,7 @@ }, { "license_expression": "artistic-1.0", - "spdx_license_expression": "Artistic-1.0", + "license_expression_spdx": "Artistic-1.0", "from_file": "LICENSE4", "start_line": 283, "end_line": 372, @@ -276,7 +276,7 @@ }, { "license_expression": "warranty-disclaimer", - "spdx_license_expression": "LicenseRef-scancode-warranty-disclaimer", + "license_expression_spdx": "LicenseRef-scancode-warranty-disclaimer", "from_file": "LICENSE4", "start_line": 374, "end_line": 376, diff --git a/tests/formattedcode/data/common/manifests-expected.json b/tests/formattedcode/data/common/manifests-expected.json index 6baf96ab3d..7df3f70314 100644 --- a/tests/formattedcode/data/common/manifests-expected.json +++ b/tests/formattedcode/data/common/manifests-expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 1, "end_line": 1, @@ -48,7 +48,7 @@ }, { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 2, "end_line": 2, @@ -131,7 +131,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 1, "end_line": 1, @@ -153,7 +153,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 1, "end_line": 1, @@ -236,7 +236,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "manifests/npm-license-string/package.json", "start_line": 1, "end_line": 1, @@ -325,7 +325,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 1, "end_line": 1, @@ -347,7 +347,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 1, "end_line": 1, @@ -1152,7 +1152,7 @@ "matches": [ { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 1, "end_line": 1, @@ -1167,7 +1167,7 @@ }, { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 2, "end_line": 2, @@ -1216,7 +1216,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 17, "end_line": 19, @@ -1230,7 +1230,7 @@ }, { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 18, "end_line": 20, @@ -1353,7 +1353,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 1, "end_line": 1, @@ -1375,7 +1375,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 1, "end_line": 1, @@ -1537,7 +1537,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 6, "end_line": 6, @@ -1558,7 +1558,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 20, "end_line": 20, @@ -1685,7 +1685,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "manifests/npm-license-string/package.json", "start_line": 1, "end_line": 1, @@ -1788,7 +1788,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "manifests/npm-license-string/package.json", "start_line": 4, "end_line": 4, @@ -1919,7 +1919,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 1, "end_line": 1, @@ -1941,7 +1941,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 1, "end_line": 1, @@ -2110,7 +2110,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 9, "end_line": 20, @@ -2131,7 +2131,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 65, "end_line": 65, @@ -2152,7 +2152,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 74, "end_line": 75, diff --git a/tests/formattedcode/data/common/manifests-expected.jsonlines b/tests/formattedcode/data/common/manifests-expected.jsonlines index 27c4dcb288..73ec845146 100644 --- a/tests/formattedcode/data/common/manifests-expected.jsonlines +++ b/tests/formattedcode/data/common/manifests-expected.jsonlines @@ -20,11 +20,11 @@ "system_environment": { "operating_system": "linux", "cpu_architecture": "64", - "platform": "Linux-5.15.0-116-generic-x86_64-with-glibc2.35", - "platform_version": "#126-Ubuntu SMP Mon Jul 1 10:14:24 UTC 2024", - "python_version": "3.10.12 (main, Mar 22 2024, 16:50:05) [GCC 11.4.0]" + "platform": "Linux-5.15.0-122-generic-x86_64-with-glibc2.35", + "platform_version": "#132-Ubuntu SMP Thu Aug 29 13:45:52 UTC 2024", + "python_version": "3.10.12 (main, Sep 11 2024, 15:47:36) [GCC 11.4.0]" }, - "spdx_license_list_version": "3.24", + "spdx_license_list_version": "3.25", "files_count": 4 } } @@ -65,7 +65,7 @@ "matches": [ { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 1, "end_line": 1, @@ -80,7 +80,7 @@ }, { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 2, "end_line": 2, @@ -163,7 +163,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 1, "end_line": 1, @@ -185,7 +185,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 1, "end_line": 1, @@ -268,7 +268,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "manifests/npm-license-string/package.json", "start_line": 1, "end_line": 1, @@ -357,7 +357,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 1, "end_line": 1, @@ -379,7 +379,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 1, "end_line": 1, @@ -1198,7 +1198,7 @@ "matches": [ { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 1, "end_line": 1, @@ -1213,7 +1213,7 @@ }, { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 2, "end_line": 2, @@ -1262,7 +1262,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 17, "end_line": 19, @@ -1276,7 +1276,7 @@ }, { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": "manifests/maven/persistence-api-1.0.pom", "start_line": 18, "end_line": 20, @@ -1407,7 +1407,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 1, "end_line": 1, @@ -1429,7 +1429,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 1, "end_line": 1, @@ -1591,7 +1591,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 6, "end_line": 6, @@ -1612,7 +1612,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "manifests/npm-license-mapping/package.json", "start_line": 20, "end_line": 20, @@ -1747,7 +1747,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "manifests/npm-license-string/package.json", "start_line": 1, "end_line": 1, @@ -1850,7 +1850,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "manifests/npm-license-string/package.json", "start_line": 4, "end_line": 4, @@ -1989,7 +1989,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 1, "end_line": 1, @@ -2011,7 +2011,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 1, "end_line": 1, @@ -2180,7 +2180,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 9, "end_line": 20, @@ -2201,7 +2201,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 65, "end_line": 65, @@ -2222,7 +2222,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "manifests/pypi/bluepyopt_setup.py", "start_line": 74, "end_line": 75, diff --git a/tests/formattedcode/data/common/manifests-expected.yaml b/tests/formattedcode/data/common/manifests-expected.yaml index 27e0f78dcd..f1d2b6a190 100644 --- a/tests/formattedcode/data/common/manifests-expected.yaml +++ b/tests/formattedcode/data/common/manifests-expected.yaml @@ -29,9 +29,9 @@ headers: system_environment: operating_system: linux cpu_architecture: 64 - platform: Linux-6.5.0-1025-oem-x86_64-with-glibc2.35 - platform_version: '#26-Ubuntu SMP PREEMPT_DYNAMIC Tue Jun 18 12:35:22 UTC 2024' - python_version: 3.11.8 (main, Feb 12 2024, 14:25:06) [GCC 11.4.0] + platform: Linux-5.15.0-122-generic-x86_64-with-glibc2.35 + platform_version: '#132-Ubuntu SMP Thu Aug 29 13:45:52 UTC 2024' + python_version: 3.10.12 (main, Sep 11 2024, 15:47:36) [GCC 11.4.0] spdx_license_list_version: '3.25' files_count: 4 summary: @@ -93,7 +93,7 @@ packages: license_expression_spdx: CDDL-1.0 matches: - license_expression: cddl-1.0 - spdx_license_expression: CDDL-1.0 + license_expression_spdx: CDDL-1.0 from_file: manifests/maven/persistence-api-1.0.pom start_line: 1 end_line: 1 @@ -106,7 +106,7 @@ packages: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE matched_text: '- name: Common Development and Distribution License (CDDL) v1.0' - license_expression: cddl-1.0 - spdx_license_expression: CDDL-1.0 + license_expression_spdx: CDDL-1.0 from_file: manifests/maven/persistence-api-1.0.pom start_line: 2 end_line: 2 @@ -176,7 +176,7 @@ packages: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: manifests/npm-license-mapping/package.json start_line: 1 end_line: 1 @@ -193,7 +193,7 @@ packages: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: manifests/npm-license-mapping/package.json start_line: 1 end_line: 1 @@ -264,7 +264,7 @@ packages: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: manifests/npm-license-string/package.json start_line: 1 end_line: 1 @@ -340,7 +340,7 @@ packages: license_expression_spdx: LGPL-3.0-only matches: - license_expression: lgpl-3.0 - spdx_license_expression: LGPL-3.0-only + license_expression_spdx: LGPL-3.0-only from_file: manifests/pypi/bluepyopt_setup.py start_line: 1 end_line: 1 @@ -357,7 +357,7 @@ packages: license_expression_spdx: LGPL-3.0-only matches: - license_expression: lgpl-3.0 - spdx_license_expression: LGPL-3.0-only + license_expression_spdx: LGPL-3.0-only from_file: manifests/pypi/bluepyopt_setup.py start_line: 1 end_line: 1 @@ -2040,7 +2040,7 @@ files: license_expression_spdx: CDDL-1.0 matches: - license_expression: cddl-1.0 - spdx_license_expression: CDDL-1.0 + license_expression_spdx: CDDL-1.0 from_file: manifests/maven/persistence-api-1.0.pom start_line: 1 end_line: 1 @@ -2053,7 +2053,7 @@ files: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cddl-1.0.RULE matched_text: '- name: Common Development and Distribution License (CDDL) v1.0' - license_expression: cddl-1.0 - spdx_license_expression: CDDL-1.0 + license_expression_spdx: CDDL-1.0 from_file: manifests/maven/persistence-api-1.0.pom start_line: 2 end_line: 2 @@ -2099,7 +2099,7 @@ files: license_expression_spdx: CDDL-1.0 matches: - license_expression: unknown-license-reference - spdx_license_expression: LicenseRef-scancode-unknown-license-reference + license_expression_spdx: LicenseRef-scancode-unknown-license-reference from_file: manifests/maven/persistence-api-1.0.pom start_line: 17 end_line: '19' @@ -2115,7 +2115,7 @@ files: Common Development and Distribution License (CDDL) v1.0 - license_expression: cddl-1.0 - spdx_license_expression: CDDL-1.0 + license_expression_spdx: CDDL-1.0 from_file: manifests/maven/persistence-api-1.0.pom start_line: 18 end_line: 20 @@ -2242,7 +2242,7 @@ files: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: manifests/npm-license-mapping/package.json start_line: 1 end_line: 1 @@ -2259,7 +2259,7 @@ files: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: manifests/npm-license-mapping/package.json start_line: 1 end_line: 1 @@ -2397,7 +2397,7 @@ files: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: manifests/npm-license-mapping/package.json start_line: 6 end_line: 6 @@ -2414,7 +2414,7 @@ files: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: manifests/npm-license-mapping/package.json start_line: 20 end_line: 20 @@ -2549,7 +2549,7 @@ files: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: manifests/npm-license-string/package.json start_line: 1 end_line: 1 @@ -2638,7 +2638,7 @@ files: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: manifests/npm-license-string/package.json start_line: 4 end_line: 4 @@ -2779,7 +2779,7 @@ files: license_expression_spdx: LGPL-3.0-only matches: - license_expression: lgpl-3.0 - spdx_license_expression: LGPL-3.0-only + license_expression_spdx: LGPL-3.0-only from_file: manifests/pypi/bluepyopt_setup.py start_line: 1 end_line: 1 @@ -2796,7 +2796,7 @@ files: license_expression_spdx: LGPL-3.0-only matches: - license_expression: lgpl-3.0 - spdx_license_expression: LGPL-3.0-only + license_expression_spdx: LGPL-3.0-only from_file: manifests/pypi/bluepyopt_setup.py start_line: 1 end_line: 1 @@ -2942,7 +2942,7 @@ files: license_expression_spdx: LGPL-3.0-only matches: - license_expression: lgpl-3.0 - spdx_license_expression: LGPL-3.0-only + license_expression_spdx: LGPL-3.0-only from_file: manifests/pypi/bluepyopt_setup.py start_line: 9 end_line: 20 @@ -2971,7 +2971,7 @@ files: license_expression_spdx: LGPL-3.0-only matches: - license_expression: lgpl-3.0 - spdx_license_expression: LGPL-3.0-only + license_expression_spdx: LGPL-3.0-only from_file: manifests/pypi/bluepyopt_setup.py start_line: 65 end_line: 65 @@ -2988,7 +2988,7 @@ files: license_expression_spdx: LGPL-3.0-only matches: - license_expression: lgpl-3.0 - spdx_license_expression: LGPL-3.0-only + license_expression_spdx: LGPL-3.0-only from_file: manifests/pypi/bluepyopt_setup.py start_line: 74 end_line: 75 diff --git a/tests/formattedcode/data/csv/livescan/expected.csv b/tests/formattedcode/data/csv/livescan/expected.csv index e23e3c3560..1de97b65fd 100644 --- a/tests/formattedcode/data/csv/livescan/expected.csv +++ b/tests/formattedcode/data/csv/livescan/expected.csv @@ -1,14 +1,14 @@ -path,type,name,base_name,extension,size,date,sha1,md5,sha256,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,detected_license_expression,detected_license_expression_spdx,percentage_of_license_text,files_count,dirs_count,size_count,scan_errors,license_expression,detection_log,license_match__license_expression,license_match__spdx_license_expression,license_match__from_file,start_line,end_line,license_match__matcher,license_match__score,license_match__matched_length,license_match__match_coverage,license_match__rule_relevance,license_match__rule_identifier,license_match__rule_url,copyright,holder,author,email,url,package__type,package__namespace,package__name,package__version,package__qualifiers,package__subpath,package__primary_language,package__description,package__release_date,package__homepage_url,package__download_url,package__size,package__sha1,package__md5,package__sha256,package__sha512,package__bug_tracking_url,package__code_view_url,package__vcs_url,package__copyright,package__holder,package__declared_license_expression,package__declared_license_expression_spdx,package__license_detections,package__other_license_expression,package__other_license_expression_spdx,package__other_license_detections,package__extracted_license_statement,package__notice_text,package__file_references,package__is_private,package__is_virtual,package__extra_data,package__repository_homepage_url,package__repository_download_url,package__api_data_url,package__datasource_id,package__purl -json2csv.rb,file,json2csv.rb,json2csv,.rb,912,2022-04-20,1236469a06a2bacbdd8e172ad718482af5b0a936,1307c281e0b153202e291b217eab85d5,12ba215313981dbe810d9ed696b7cc753d97adfcc26eba1e13f941dc7506aa4e,text/x-script.python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,apache-2.0,Apache-2.0,62.04,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +path,type,name,base_name,extension,size,date,sha1,md5,sha256,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,detected_license_expression,detected_license_expression_spdx,percentage_of_license_text,files_count,dirs_count,size_count,scan_errors,license_expression,detection_log,license_match__license_expression,license_match__license_expression_spdx,license_match__from_file,start_line,end_line,license_match__matcher,license_match__score,license_match__matched_length,license_match__match_coverage,license_match__rule_relevance,license_match__rule_identifier,license_match__rule_url,copyright,holder,author,email,url,package__type,package__namespace,package__name,package__version,package__qualifiers,package__subpath,package__primary_language,package__description,package__release_date,package__homepage_url,package__download_url,package__size,package__sha1,package__md5,package__sha256,package__sha512,package__bug_tracking_url,package__code_view_url,package__vcs_url,package__copyright,package__holder,package__declared_license_expression,package__declared_license_expression_spdx,package__license_detections,package__other_license_expression,package__other_license_expression_spdx,package__other_license_detections,package__extracted_license_statement,package__notice_text,package__file_references,package__is_private,package__is_virtual,package__extra_data,package__repository_homepage_url,package__repository_download_url,package__api_data_url,package__datasource_id,package__purl +json2csv.rb,file,json2csv.rb,json2csv,.rb,912,2024-03-27,1236469a06a2bacbdd8e172ad718482af5b0a936,1307c281e0b153202e291b217eab85d5,12ba215313981dbe810d9ed696b7cc753d97adfcc26eba1e13f941dc7506aa4e,text/x-script.python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,apache-2.0,Apache-2.0,62.04,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,apache-2.0,,apache-2.0,Apache-2.0,scan/json2csv.rb,5,13,2-aho,100.00,85,100.00,100.00,apache-2.0_7.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_7.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,,,,Copyright (c) 2017 nexB Inc. and others,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,,,,,nexB Inc. and others,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,8,,,,,,,,,,,,http://www.apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -license,file,license,license,,679,2022-04-20,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,a34098a43e5677495f59dff825a3f9bc0f2b0261d75feb2356919f4c3ce049ab,text/plain,ASCII text,,False,True,False,False,False,False,gpl-2.0-plus,GPL-2.0-or-later,100.0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +license,file,license,license,,679,2024-03-27,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,a34098a43e5677495f59dff825a3f9bc0f2b0261d75feb2356919f4c3ce049ab,text/plain,ASCII text,,False,True,False,False,False,False,gpl-2.0-plus,GPL-2.0-or-later,100.0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, license,,,,,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,,gpl-2.0-plus,GPL-2.0-or-later,scan/license,1,12,1-hash,100.00,113,100.00,100.00,gpl-2.0-plus_420.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_420.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -package.json,file,package.json,package,.json,2200,2022-04-20,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,29f6068a1b6c7d06f115a5edc4ed8558edde42c6bbf0145ed77cf1108a0dd529,application/json,JSON data,,False,True,False,False,False,False,mit,MIT,45.72,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +package.json,file,package.json,package,.json,2200,2024-03-27,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,29f6068a1b6c7d06f115a5edc4ed8558edde42c6bbf0145ed77cf1108a0dd529,application/json,JSON data,,False,True,False,False,False,False,mit,MIT,45.72,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,mit,MIT,scan/package.json,24,24,2-aho,100.00,3,100.00,100.00,mit_27.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,mit,MIT,scan/package.json,24,24,3-seq,84.68,136,85.53,99.00,mit_823.RULE,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,Copyright (c) 2012 LearnBoost ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, @@ -17,4 +17,4 @@ package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,,,,TJ Holowaychuk,,,,,,,, package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,npm,,cookie-signature,v 1.0.3,,,JavaScript,Sign and unsign cookies,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,git+https://github.com/visionmedia/node-cookie-signature.git,,,mit,MIT,"[{'license_expression': 'mit', 'license_expression_spdx': 'MIT', 'matches': [{'license_expression': 'mit', 'spdx_license_expression': 'MIT', 'from_file': 'scan/package.json', 'start_line': 24, 'end_line': 24, 'matcher': '2-aho', 'score': 100.0, 'matched_length': 3, 'match_coverage': 100.0, 'rule_relevance': 100, 'rule_identifier': 'mit_27.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}, {'license_expression': 'mit', 'spdx_license_expression': 'MIT', 'from_file': 'scan/package.json', 'start_line': 24, 'end_line': 24, 'matcher': '3-seq', 'score': 84.68, 'matched_length': 136, 'match_coverage': 85.53, 'rule_relevance': 99, 'rule_identifier': 'mit_823.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE'}], 'identifier': 'mit-13195f55-8383-ff05-7a20-04ec94bbf4b1'}]",,,,,,,,,,https://www.npmjs.com/package/cookie-signature,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,https://registry.npmjs.org/cookie-signature/1.0.3,npm_package_json,pkg:npm/cookie-signature@1.0.3 +package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,npm,,cookie-signature,v 1.0.3,,,JavaScript,Sign and unsign cookies,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,git+https://github.com/visionmedia/node-cookie-signature.git,,,mit,MIT,"[{'license_expression': 'mit', 'license_expression_spdx': 'MIT', 'matches': [{'license_expression': 'mit', 'license_expression_spdx': 'MIT', 'from_file': 'scan/package.json', 'start_line': 24, 'end_line': 24, 'matcher': '2-aho', 'score': 100.0, 'matched_length': 3, 'match_coverage': 100.0, 'rule_relevance': 100, 'rule_identifier': 'mit_27.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}, {'license_expression': 'mit', 'license_expression_spdx': 'MIT', 'from_file': 'scan/package.json', 'start_line': 24, 'end_line': 24, 'matcher': '3-seq', 'score': 84.68, 'matched_length': 136, 'match_coverage': 85.53, 'rule_relevance': 99, 'rule_identifier': 'mit_823.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE'}], 'identifier': 'mit-13195f55-8383-ff05-7a20-04ec94bbf4b1'}]",,,,,,,,,,https://www.npmjs.com/package/cookie-signature,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,https://registry.npmjs.org/cookie-signature/1.0.3,npm_package_json,pkg:npm/cookie-signature@1.0.3 diff --git a/tests/formattedcode/data/csv/packages/expected-no-root.csv b/tests/formattedcode/data/csv/packages/expected-no-root.csv index 9c48d3c4b2..11799eecad 100644 --- a/tests/formattedcode/data/csv/packages/expected-no-root.csv +++ b/tests/formattedcode/data/csv/packages/expected-no-root.csv @@ -1,4 +1,4 @@ path,type,scan_errors,package__type,package__namespace,package__name,package__version,package__qualifiers,package__subpath,package__primary_language,package__description,package__release_date,package__homepage_url,package__download_url,package__size,package__sha1,package__md5,package__sha256,package__sha512,package__bug_tracking_url,package__code_view_url,package__vcs_url,package__copyright,package__holder,package__declared_license_expression,package__declared_license_expression_spdx,package__license_detections,package__other_license_expression,package__other_license_expression_spdx,package__other_license_detections,package__extracted_license_statement,package__notice_text,package__file_references,package__is_private,package__is_virtual,package__extra_data,package__repository_homepage_url,package__repository_download_url,package__api_data_url,package__datasource_id,package__purl package.json,file,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'license_expression_spdx': 'Artistic-2.0', 'matches': [{'license_expression': 'artistic-2.0', 'spdx_license_expression': 'Artistic-2.0', 'from_file': 'scan/package.json', 'start_line': 1, 'end_line': 1, 'matcher': '1-hash', 'score': 50.0, 'matched_length': 3, 'match_coverage': 100.0, 'rule_relevance': 50, 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}], 'identifier': 'artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774'}]",,,,"- Artistic-2.0 +package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'license_expression_spdx': 'Artistic-2.0', 'matches': [{'license_expression': 'artistic-2.0', 'license_expression_spdx': 'Artistic-2.0', 'from_file': 'scan/package.json', 'start_line': 1, 'end_line': 1, 'matcher': '1-hash', 'score': 50.0, 'matched_length': 3, 'match_coverage': 100.0, 'rule_relevance': 50, 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}], 'identifier': 'artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774'}]",,,,"- Artistic-2.0 ",,,,,,https://www.npmjs.com/package/npm,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,https://registry.npmjs.org/npm/2.13.5,npm_package_json,pkg:npm/npm@2.13.5 diff --git a/tests/formattedcode/data/csv/packages/expected.csv b/tests/formattedcode/data/csv/packages/expected.csv index 866b646ca7..3c89407734 100644 --- a/tests/formattedcode/data/csv/packages/expected.csv +++ b/tests/formattedcode/data/csv/packages/expected.csv @@ -1,5 +1,5 @@ path,type,scan_errors,package__type,package__namespace,package__name,package__version,package__qualifiers,package__subpath,package__primary_language,package__description,package__release_date,package__homepage_url,package__download_url,package__size,package__sha1,package__md5,package__sha256,package__sha512,package__bug_tracking_url,package__code_view_url,package__vcs_url,package__copyright,package__holder,package__declared_license_expression,package__declared_license_expression_spdx,package__license_detections,package__other_license_expression,package__other_license_expression_spdx,package__other_license_detections,package__extracted_license_statement,package__notice_text,package__file_references,package__is_private,package__is_virtual,package__extra_data,package__repository_homepage_url,package__repository_download_url,package__api_data_url,package__datasource_id,package__purl scan/,directory,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, scan/package.json,file,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -scan/package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'license_expression_spdx': 'Artistic-2.0', 'matches': [{'license_expression': 'artistic-2.0', 'spdx_license_expression': 'Artistic-2.0', 'from_file': 'scan/package.json', 'start_line': 1, 'end_line': 1, 'matcher': '1-hash', 'score': 50.0, 'matched_length': 3, 'match_coverage': 100.0, 'rule_relevance': 50, 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}], 'identifier': 'artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774'}]",,,,"- Artistic-2.0 +scan/package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'license_expression_spdx': 'Artistic-2.0', 'matches': [{'license_expression': 'artistic-2.0', 'license_expression_spdx': 'Artistic-2.0', 'from_file': 'scan/package.json', 'start_line': 1, 'end_line': 1, 'matcher': '1-hash', 'score': 50.0, 'matched_length': 3, 'match_coverage': 100.0, 'rule_relevance': 50, 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}], 'identifier': 'artistic_2_0-2ca48deb-7b37-fc93-edd9-b349ad073774'}]",,,,"- Artistic-2.0 ",,,,,,https://www.npmjs.com/package/npm,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,https://registry.npmjs.org/npm/2.13.5,npm_package_json,pkg:npm/npm@2.13.5 diff --git a/tests/formattedcode/data/reuse/vb.json b/tests/formattedcode/data/reuse/vb.json index ca38934430..7eafc26ccc 100644 --- a/tests/formattedcode/data/reuse/vb.json +++ b/tests/formattedcode/data/reuse/vb.json @@ -740,7 +740,7 @@ "licenses": [ { "license_expression": "jboss-eula", - "spdx_license_expression": "LicenseRef-scancode-jboss-eula", + "license_expression_spdx": "LicenseRef-scancode-jboss-eula", "detection_log": [ "not-combined" ], @@ -842,7 +842,7 @@ "licenses": [ { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "detection_log": [ "not-combined" ], @@ -994,7 +994,7 @@ "licenses": [ { "license_expression": "apache-1.1", - "spdx_license_expression": "Apache-1.1", + "license_expression_spdx": "Apache-1.1", "detection_log": [ "not-combined" ], @@ -1102,7 +1102,7 @@ "licenses": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "detection_log": [ "not-combined" ], @@ -1192,7 +1192,7 @@ "licenses": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "detection_log": [ "not-combined" ], @@ -1294,7 +1294,7 @@ "licenses": [ { "license_expression": "cpl-1.0", - "spdx_license_expression": "CPL-1.0", + "license_expression_spdx": "CPL-1.0", "detection_log": [ "not-combined" ], @@ -1384,7 +1384,7 @@ "licenses": [ { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "detection_log": [ "not-combined" ], @@ -1536,7 +1536,7 @@ "licenses": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "detection_log": [ "not-combined" ], @@ -1644,7 +1644,7 @@ "licenses": [ { "license_expression": "cc-by-2.5", - "spdx_license_expression": "CC-BY-2.5", + "license_expression_spdx": "CC-BY-2.5", "detection_log": [ "not-combined" ], @@ -1752,7 +1752,7 @@ "licenses": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "detection_log": [ "not-combined" ], @@ -1952,7 +1952,7 @@ "licenses": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "detection_log": [ "not-combined" ], @@ -2054,7 +2054,7 @@ "licenses": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "detection_log": [ "not-combined" ], @@ -2099,7 +2099,7 @@ }, { "license_expression": "public-domain-disclaimer", - "spdx_license_expression": "LicenseRef-scancode-public-domain-disclaimer", + "license_expression_spdx": "LicenseRef-scancode-public-domain-disclaimer", "detection_log": [ "not-combined" ], @@ -2247,7 +2247,7 @@ "licenses": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "detection_log": [ "unknown-reference-to-local-file" ], @@ -2387,7 +2387,7 @@ "licenses": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "detection_log": [ "unknown-reference-to-local-file" ], @@ -2543,7 +2543,7 @@ "licenses": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "detection_log": [ "unknown-reference-to-local-file" ], @@ -2626,7 +2626,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "detection_log": [ "not-combined" ], @@ -2730,7 +2730,7 @@ "licenses": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "detection_log": [ "not-combined" ], @@ -2832,7 +2832,7 @@ "licenses": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "detection_log": [ "unknown-reference-to-local-file" ], @@ -2972,7 +2972,7 @@ "licenses": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "detection_log": [ "unknown-reference-to-local-file" ], @@ -3152,7 +3152,7 @@ "licenses": [ { "license_expression": "gpl-2.0-plus WITH ada-linking-exception", - "spdx_license_expression": "GPL-2.0-or-later WITH LicenseRef-scancode-ada-linking-exception", + "license_expression_spdx": "GPL-2.0-or-later WITH LicenseRef-scancode-ada-linking-exception", "detection_log": [ "not-combined" ], @@ -3362,7 +3362,7 @@ "licenses": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "detection_log": [ "unknown-reference-to-local-file" ], @@ -3502,7 +3502,7 @@ "licenses": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "detection_log": [ "not-combined" ], @@ -3592,7 +3592,7 @@ "licenses": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "detection_log": [ "unknown-reference-to-local-file" ], @@ -3675,7 +3675,7 @@ }, { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "detection_log": [ "unknown-reference-to-local-file" ], @@ -3857,7 +3857,7 @@ "licenses": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "detection_log": [ "not-combined" ], @@ -4005,7 +4005,7 @@ "licenses": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "detection_log": [ "not-combined" ], @@ -4109,7 +4109,7 @@ "licenses": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "detection_log": [ "not-combined" ], @@ -4253,7 +4253,7 @@ "licenses": [ { "license_expression": "mit-old-style", - "spdx_license_expression": "LicenseRef-scancode-mit-old-style", + "license_expression_spdx": "LicenseRef-scancode-mit-old-style", "detection_log": [ "not-combined" ], diff --git a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml index cbd678d982..7a82f48dc1 100644 --- a/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml +++ b/tests/formattedcode/data/yaml/package-and-licenses-expected.yaml @@ -21,7 +21,7 @@ headers: for any legal advice. ScanCode is a free software code scanning tool from nexB Inc. and others. Visit https://github.com/nexB/scancode-toolkit/ for support and download. - output_format_version: 3.1.0 + output_format_version: 3.2.0 message: errors: [] warnings: [] @@ -29,10 +29,10 @@ headers: system_environment: operating_system: linux cpu_architecture: 64 - platform: Linux-5.15.0-112-generic-x86_64-with-glibc2.35 - platform_version: '#122-Ubuntu SMP Thu May 23 07:48:21 UTC 2024' + platform: Linux-5.15.0-113-generic-x86_64-with-glibc2.35 + platform_version: '#123-Ubuntu SMP Mon Jun 10 08:16:17 UTC 2024' python_version: 3.10.12 (main, Nov 20 2023, 15:14:05) [GCC 11.4.0] - spdx_license_list_version: '3.23' + spdx_license_list_version: '3.24' files_count: 4 summary: declared_license_expression: apache-2.0 @@ -91,7 +91,7 @@ packages: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: package-and-licenses/setup.cfg start_line: 1 end_line: 1 @@ -1060,7 +1060,7 @@ files: license_expression_spdx: Apache-2.0 AND (Apache-2.0 OR MIT) matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: package-and-licenses/README.txt start_line: 3 end_line: 3 @@ -1073,7 +1073,7 @@ files: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_73.RULE matched_text: This is licensed under Apache-2.0 or MIT - license_expression: apache-2.0 OR mit - spdx_license_expression: Apache-2.0 OR MIT + license_expression_spdx: Apache-2.0 OR MIT from_file: package-and-licenses/README.txt start_line: 3 end_line: 3 @@ -1136,7 +1136,7 @@ files: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: package-and-licenses/apache-2.0.LICENSE start_line: 2 end_line: 202 @@ -1345,7 +1345,7 @@ files: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: package-and-licenses/mit.LICENSE start_line: 2 end_line: '19' @@ -1441,7 +1441,7 @@ files: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: package-and-licenses/setup.cfg start_line: 1 end_line: 1 @@ -1484,7 +1484,7 @@ files: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: package-and-licenses/setup.cfg start_line: 4 end_line: 4 diff --git a/tests/licensedcode/data/additional_licenses/additional_license_combined_test.expected.json b/tests/licensedcode/data/additional_licenses/additional_license_combined_test.expected.json index 6f95f59346..84756a725d 100644 --- a/tests/licensedcode/data/additional_licenses/additional_license_combined_test.expected.json +++ b/tests/licensedcode/data/additional_licenses/additional_license_combined_test.expected.json @@ -408,7 +408,7 @@ "matches": [ { "license_expression": "example-installed-1", - "spdx_license_expression": "scancode-example-installed1", + "license_expression_spdx": "scancode-example-installed1", "from_file": "additional_license_combined_test.txt", "start_line": 1, "end_line": 1, @@ -422,7 +422,7 @@ }, { "license_expression": "example-installed-2", - "spdx_license_expression": "LicenseRef-scancode-example-installed2", + "license_expression_spdx": "LicenseRef-scancode-example-installed2", "from_file": "additional_license_combined_test.txt", "start_line": 3, "end_line": 3, @@ -436,7 +436,7 @@ }, { "license_expression": "example1", - "spdx_license_expression": "scancode-example1", + "license_expression_spdx": "scancode-example1", "from_file": "additional_license_combined_test.txt", "start_line": 5, "end_line": 5, @@ -450,7 +450,7 @@ }, { "license_expression": "example2", - "spdx_license_expression": "scancode-example2", + "license_expression_spdx": "scancode-example2", "from_file": "additional_license_combined_test.txt", "start_line": 5, "end_line": 9, @@ -464,7 +464,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "additional_license_combined_test.txt", "start_line": 12, "end_line": 12, diff --git a/tests/licensedcode/data/additional_licenses/additional_license_directory_test.expected.json b/tests/licensedcode/data/additional_licenses/additional_license_directory_test.expected.json index 2958a7cba2..4f21067f4a 100644 --- a/tests/licensedcode/data/additional_licenses/additional_license_directory_test.expected.json +++ b/tests/licensedcode/data/additional_licenses/additional_license_directory_test.expected.json @@ -174,7 +174,7 @@ "matches": [ { "license_expression": "example1", - "spdx_license_expression": "scancode-example1", + "license_expression_spdx": "scancode-example1", "from_file": "additional_license_directory_test.txt", "start_line": 1, "end_line": 1, @@ -188,7 +188,7 @@ }, { "license_expression": "example2", - "spdx_license_expression": "scancode-example2", + "license_expression_spdx": "scancode-example2", "from_file": "additional_license_directory_test.txt", "start_line": 1, "end_line": 5, diff --git a/tests/licensedcode/data/additional_licenses/additional_license_plugin_test.expected.json b/tests/licensedcode/data/additional_licenses/additional_license_plugin_test.expected.json index b61818ca0b..011b2128c7 100644 --- a/tests/licensedcode/data/additional_licenses/additional_license_plugin_test.expected.json +++ b/tests/licensedcode/data/additional_licenses/additional_license_plugin_test.expected.json @@ -100,7 +100,7 @@ "matches": [ { "license_expression": "example-installed-1", - "spdx_license_expression": "scancode-example-installed1", + "license_expression_spdx": "scancode-example-installed1", "from_file": "additional_license_plugin_test.txt", "start_line": 1, "end_line": 1, diff --git a/tests/licensedcode/data/licenses_reference_reporting/license-reference-works-with-clues.expected.json b/tests/licensedcode/data/licenses_reference_reporting/license-reference-works-with-clues.expected.json index 3ef04356be..dfec4b7a5c 100644 --- a/tests/licensedcode/data/licenses_reference_reporting/license-reference-works-with-clues.expected.json +++ b/tests/licensedcode/data/licenses_reference_reporting/license-reference-works-with-clues.expected.json @@ -1653,7 +1653,7 @@ "matches": [ { "license_expression": "python", - "spdx_license_expression": "Python-2.0", + "license_expression_spdx": "Python-2.0", "from_file": "python.LICENSE", "start_line": 23, "end_line": 26, @@ -1677,7 +1677,7 @@ "matches": [ { "license_expression": "other-copyleft", - "spdx_license_expression": "LicenseRef-scancode-other-copyleft", + "license_expression_spdx": "LicenseRef-scancode-other-copyleft", "from_file": "python.LICENSE", "start_line": 62, "end_line": 62, @@ -1693,7 +1693,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "python.LICENSE", "start_line": 62, "end_line": 63, @@ -1709,7 +1709,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "python.LICENSE", "start_line": 63, "end_line": 63, @@ -1725,7 +1725,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "python.LICENSE", "start_line": 64, "end_line": 65, @@ -1741,7 +1741,7 @@ }, { "license_expression": "other-copyleft", - "spdx_license_expression": "LicenseRef-scancode-other-copyleft", + "license_expression_spdx": "LicenseRef-scancode-other-copyleft", "from_file": "python.LICENSE", "start_line": 65, "end_line": 65, @@ -1757,7 +1757,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "python.LICENSE", "start_line": 66, "end_line": 66, @@ -1773,7 +1773,7 @@ }, { "license_expression": "other-copyleft", - "spdx_license_expression": "LicenseRef-scancode-other-copyleft", + "license_expression_spdx": "LicenseRef-scancode-other-copyleft", "from_file": "python.LICENSE", "start_line": 68, "end_line": 68, @@ -1789,7 +1789,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "python.LICENSE", "start_line": 71, "end_line": 71, @@ -1813,7 +1813,7 @@ "matches": [ { "license_expression": "python", - "spdx_license_expression": "Python-2.0", + "license_expression_spdx": "Python-2.0", "from_file": "python.LICENSE", "start_line": 77, "end_line": 255, @@ -1829,7 +1829,7 @@ }, { "license_expression": "python-cwi", - "spdx_license_expression": "LicenseRef-scancode-python-cwi", + "license_expression_spdx": "LicenseRef-scancode-python-cwi", "from_file": "python.LICENSE", "start_line": 257, "end_line": 272, @@ -1853,7 +1853,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "python.LICENSE", "start_line": 274, "end_line": 274, @@ -1869,7 +1869,7 @@ }, { "license_expression": "bzip2-libbzip-2010", - "spdx_license_expression": "bzip2-1.0.6", + "license_expression_spdx": "bzip2-1.0.6", "from_file": "python.LICENSE", "start_line": 281, "end_line": 310, @@ -1895,7 +1895,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "python.LICENSE", "start_line": 317, "end_line": 317, @@ -1911,7 +1911,7 @@ }, { "license_expression": "sleepycat", - "spdx_license_expression": "Sleepycat", + "license_expression_spdx": "Sleepycat", "from_file": "python.LICENSE", "start_line": 334, "end_line": 351, @@ -1937,7 +1937,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "python.LICENSE", "start_line": 369, "end_line": 391, @@ -1961,7 +1961,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "python.LICENSE", "start_line": 397, "end_line": 419, @@ -1985,7 +1985,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "python.LICENSE", "start_line": 422, "end_line": 422, @@ -2001,7 +2001,7 @@ }, { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "python.LICENSE", "start_line": 428, "end_line": 432, @@ -2017,7 +2017,7 @@ }, { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "python.LICENSE", "start_line": 434, "end_line": 434, @@ -2043,7 +2043,7 @@ "matches": [ { "license_expression": "openssl", - "spdx_license_expression": "OpenSSL-standalone", + "license_expression_spdx": "OpenSSL-standalone", "from_file": "python.LICENSE", "start_line": 440, "end_line": 487, @@ -2067,7 +2067,7 @@ "matches": [ { "license_expression": "ssleay-windows", - "spdx_license_expression": "SSLeay-standalone", + "license_expression_spdx": "SSLeay-standalone", "from_file": "python.LICENSE", "start_line": 497, "end_line": 548, @@ -2091,7 +2091,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "python.LICENSE", "start_line": 552, "end_line": 552, @@ -2107,7 +2107,7 @@ }, { "license_expression": "tcl", - "spdx_license_expression": "TCL", + "license_expression_spdx": "TCL", "from_file": "python.LICENSE", "start_line": 554, "end_line": 593, @@ -2133,7 +2133,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "python.LICENSE", "start_line": 595, "end_line": 595, @@ -2149,7 +2149,7 @@ }, { "license_expression": "tcl", - "spdx_license_expression": "TCL", + "license_expression_spdx": "TCL", "from_file": "python.LICENSE", "start_line": 597, "end_line": 635, @@ -2173,7 +2173,7 @@ "license_clues": [ { "license_expression": "bsd-simplified", - "spdx_license_expression": "BSD-2-Clause", + "license_expression_spdx": "BSD-2-Clause", "from_file": "python.LICENSE", "start_line": 358, "end_line": 363, diff --git a/tests/licensedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json b/tests/licensedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json index a0db977ccb..8e42514689 100644 --- a/tests/licensedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json +++ b/tests/licensedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "artistic-2.0 OR mit", - "spdx_license_expression": "Artistic-2.0 OR MIT", + "license_expression_spdx": "Artistic-2.0 OR MIT", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -501,7 +501,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan/copyr.java", "start_line": 3, "end_line": 16, @@ -517,7 +517,7 @@ }, { "license_expression": "mit OR bsd-simplified", - "spdx_license_expression": "MIT OR BSD-2-Clause", + "license_expression_spdx": "MIT OR BSD-2-Clause", "from_file": "scan/copyr.java", "start_line": 19, "end_line": 19, @@ -590,7 +590,7 @@ "matches": [ { "license_expression": "artistic-2.0 OR mit", - "spdx_license_expression": "Artistic-2.0 OR MIT", + "license_expression_spdx": "Artistic-2.0 OR MIT", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -637,7 +637,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 28, "end_line": 28, diff --git a/tests/licensedcode/data/licenses_reference_reporting/scan-with-reference.expected.json b/tests/licensedcode/data/licenses_reference_reporting/scan-with-reference.expected.json index a9fb8e949f..0ee5aff24b 100644 --- a/tests/licensedcode/data/licenses_reference_reporting/scan-with-reference.expected.json +++ b/tests/licensedcode/data/licenses_reference_reporting/scan-with-reference.expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "artistic-2.0 OR mit", - "spdx_license_expression": "Artistic-2.0 OR MIT", + "license_expression_spdx": "Artistic-2.0 OR MIT", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -491,7 +491,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan/copyr.java", "start_line": 3, "end_line": 16, @@ -505,7 +505,7 @@ }, { "license_expression": "mit OR bsd-simplified", - "spdx_license_expression": "MIT OR BSD-2-Clause", + "license_expression_spdx": "MIT OR BSD-2-Clause", "from_file": "scan/copyr.java", "start_line": 19, "end_line": 19, @@ -575,7 +575,7 @@ "matches": [ { "license_expression": "artistic-2.0 OR mit", - "spdx_license_expression": "Artistic-2.0 OR MIT", + "license_expression_spdx": "Artistic-2.0 OR MIT", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -622,7 +622,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 28, "end_line": 28, diff --git a/tests/licensedcode/data/match_spdx/scan-expected.json b/tests/licensedcode/data/match_spdx/scan-expected.json index eee03de60e..28328f2689 100644 --- a/tests/licensedcode/data/match_spdx/scan-expected.json +++ b/tests/licensedcode/data/match_spdx/scan-expected.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "license", "start_line": 240, "end_line": 240, diff --git a/tests/licensedcode/data/match_unknown/unknown-license-expected.json b/tests/licensedcode/data/match_unknown/unknown-license-expected.json index 2d11e9e21b..befc2bdac8 100644 --- a/tests/licensedcode/data/match_unknown/unknown-license-expected.json +++ b/tests/licensedcode/data/match_unknown/unknown-license-expected.json @@ -36,7 +36,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "unknown.txt", "start_line": 1, "end_line": 10, diff --git a/tests/licensedcode/data/match_unknown/unknown-license-text-expected.json b/tests/licensedcode/data/match_unknown/unknown-license-text-expected.json index 00bc16f1ee..ca6906df36 100644 --- a/tests/licensedcode/data/match_unknown/unknown-license-text-expected.json +++ b/tests/licensedcode/data/match_unknown/unknown-license-text-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "unknown.txt", "start_line": 1, "end_line": 10, diff --git a/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json b/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json index d58558a07a..ea29b34be5 100644 --- a/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json +++ b/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json @@ -233,7 +233,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "woodstox/ASL2.0", "start_line": 2, "end_line": 4, @@ -268,7 +268,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "woodstox/LICENSE", "start_line": 1, "end_line": 11, @@ -320,7 +320,7 @@ "license_clues": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "woodstox/NOTICE", "start_line": 1, "end_line": 2, diff --git a/tests/licensedcode/data/plugin_license/ignored_reference/or_and_problem.expected.json b/tests/licensedcode/data/plugin_license/ignored_reference/or_and_problem.expected.json index a04913b28a..51d5ee1a0a 100644 --- a/tests/licensedcode/data/plugin_license/ignored_reference/or_and_problem.expected.json +++ b/tests/licensedcode/data/plugin_license/ignored_reference/or_and_problem.expected.json @@ -89,7 +89,7 @@ "matches": [ { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "or_and_problem/COPYING-LGPL-2.1", "start_line": 2, "end_line": 3, @@ -124,7 +124,7 @@ "matches": [ { "license_expression": "mpl-1.1", - "spdx_license_expression": "MPL-1.1", + "license_expression_spdx": "MPL-1.1", "from_file": "or_and_problem/COPYING-MPL-1.1", "start_line": 1, "end_line": 2, @@ -169,7 +169,7 @@ "matches": [ { "license_expression": "lgpl-2.1 OR mpl-1.1", - "spdx_license_expression": "LGPL-2.1-only OR MPL-1.1", + "license_expression_spdx": "LGPL-2.1-only OR MPL-1.1", "from_file": "or_and_problem/src/cairo-analysis-surface-private.h", "start_line": 4, "end_line": 29, diff --git a/tests/licensedcode/data/plugin_license/license-expression/scan.expected.json b/tests/licensedcode/data/plugin_license/license-expression/scan.expected.json index 56a7e85481..e99ad76f5d 100644 --- a/tests/licensedcode/data/plugin_license/license-expression/scan.expected.json +++ b/tests/licensedcode/data/plugin_license/license-expression/scan.expected.json @@ -302,7 +302,7 @@ "matches": [ { "license_expression": "apache-1.0", - "spdx_license_expression": "Apache-1.0", + "license_expression_spdx": "Apache-1.0", "from_file": "scan/apache-1.0.txt", "start_line": 4, "end_line": 54, @@ -337,7 +337,7 @@ "matches": [ { "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib", - "spdx_license_expression": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", + "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "start_line": 1, "end_line": 1, diff --git a/tests/licensedcode/data/plugin_license/license-expression/spdx-expressions.expected.json b/tests/licensedcode/data/plugin_license/license-expression/spdx-expressions.expected.json index e501546e7f..24f4a668a3 100644 --- a/tests/licensedcode/data/plugin_license/license-expression/spdx-expressions.expected.json +++ b/tests/licensedcode/data/plugin_license/license-expression/spdx-expressions.expected.json @@ -197,7 +197,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "spdx-expressions.txt", "start_line": 2, "end_line": 2, @@ -213,7 +213,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "spdx-expressions.txt", "start_line": 4, "end_line": 4, diff --git a/tests/licensedcode/data/plugin_license/license_reference/license-ref-see-copying.expected.json b/tests/licensedcode/data/plugin_license/license_reference/license-ref-see-copying.expected.json index 9a7ba129e7..73424fffc5 100644 --- a/tests/licensedcode/data/plugin_license/license_reference/license-ref-see-copying.expected.json +++ b/tests/licensedcode/data/plugin_license/license_reference/license-ref-see-copying.expected.json @@ -82,7 +82,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "license-ref-see-copying/COPYING", "start_line": 1, "end_line": 1, @@ -117,7 +117,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "license-ref-see-copying/ref", "start_line": 1, "end_line": 1, @@ -133,7 +133,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "license-ref-see-copying/COPYING", "start_line": 1, "end_line": 1, diff --git a/tests/licensedcode/data/plugin_license/license_reference/scan-ref.expected.json b/tests/licensedcode/data/plugin_license/license_reference/scan-ref.expected.json index 66c3bb8d63..dcdd9d1d19 100644 --- a/tests/licensedcode/data/plugin_license/license_reference/scan-ref.expected.json +++ b/tests/licensedcode/data/plugin_license/license_reference/scan-ref.expected.json @@ -82,7 +82,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan-ref/LICENSE", "start_line": 1, "end_line": 1, @@ -117,7 +117,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "scan-ref/license-notice.txt", "start_line": 34, "end_line": 34, @@ -133,7 +133,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan-ref/LICENSE", "start_line": 1, "end_line": 1, diff --git a/tests/licensedcode/data/plugin_license/license_reference/scan-unknown-reference-copyright.expected.json b/tests/licensedcode/data/plugin_license/license_reference/scan-unknown-reference-copyright.expected.json index 0d513fe92a..858c5fac73 100644 --- a/tests/licensedcode/data/plugin_license/license_reference/scan-unknown-reference-copyright.expected.json +++ b/tests/licensedcode/data/plugin_license/license_reference/scan-unknown-reference-copyright.expected.json @@ -125,7 +125,7 @@ "matches": [ { "license_expression": "x11-xconsortium-veillard", - "spdx_license_expression": "LicenseRef-scancode-x11-xconsortium-veillard", + "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard", "from_file": "scan-unknown-reference-copyright/Copyright", "start_line": 7, "end_line": 26, @@ -160,7 +160,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "scan-unknown-reference-copyright/build_glob.py", "start_line": 9, "end_line": 9, @@ -176,7 +176,7 @@ }, { "license_expression": "x11-xconsortium-veillard", - "spdx_license_expression": "LicenseRef-scancode-x11-xconsortium-veillard", + "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard", "from_file": "scan-unknown-reference-copyright/Copyright", "start_line": 7, "end_line": 26, @@ -213,7 +213,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "scan-unknown-reference-copyright/c14n.c", "start_line": 8, "end_line": 8, @@ -229,7 +229,7 @@ }, { "license_expression": "x11-xconsortium-veillard", - "spdx_license_expression": "LicenseRef-scancode-x11-xconsortium-veillard", + "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard", "from_file": "scan-unknown-reference-copyright/Copyright", "start_line": 7, "end_line": 26, @@ -286,7 +286,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "scan-unknown-reference-copyright/include/libxml/c14n.h", "start_line": 13, "end_line": 13, @@ -302,7 +302,7 @@ }, { "license_expression": "x11-xconsortium-veillard", - "spdx_license_expression": "LicenseRef-scancode-x11-xconsortium-veillard", + "license_expression_spdx": "LicenseRef-scancode-x11-xconsortium-veillard", "from_file": "scan-unknown-reference-copyright/Copyright", "start_line": 7, "end_line": 26, diff --git a/tests/licensedcode/data/plugin_license/license_reference/scan-wref.expected.json b/tests/licensedcode/data/plugin_license/license_reference/scan-wref.expected.json index 7a1c99517f..f34238d3c7 100644 --- a/tests/licensedcode/data/plugin_license/license_reference/scan-wref.expected.json +++ b/tests/licensedcode/data/plugin_license/license_reference/scan-wref.expected.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "scan-without-ref/license-notice.txt", "start_line": 34, "end_line": 34, diff --git a/tests/licensedcode/data/plugin_license/license_reference/unknown-ref-to-key-file-root.expected.json b/tests/licensedcode/data/plugin_license/license_reference/unknown-ref-to-key-file-root.expected.json index 707530d5e4..ead68bc570 100644 --- a/tests/licensedcode/data/plugin_license/license_reference/unknown-ref-to-key-file-root.expected.json +++ b/tests/licensedcode/data/plugin_license/license_reference/unknown-ref-to-key-file-root.expected.json @@ -248,7 +248,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 1, "end_line": 1, @@ -264,7 +264,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 5, "end_line": 21, @@ -299,7 +299,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/README.md", "start_line": 219, "end_line": 222, @@ -334,7 +334,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "unknown-ref-to-key-file-root/esprima-compare.js", "start_line": 2, "end_line": 2, @@ -350,7 +350,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 1, "end_line": 1, @@ -366,7 +366,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 5, "end_line": 21, @@ -403,7 +403,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "unknown-ref-to-key-file-root/generate-index.js", "start_line": 2, "end_line": 2, @@ -419,7 +419,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 1, "end_line": 1, @@ -435,7 +435,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 5, "end_line": 21, @@ -472,7 +472,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "unknown-ref-to-key-file-root/index.js", "start_line": 2, "end_line": 2, @@ -488,7 +488,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 1, "end_line": 1, @@ -504,7 +504,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 5, "end_line": 21, @@ -541,7 +541,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/js-tokens-3.0.2.ABOUT", "start_line": 4, "end_line": 5, @@ -576,7 +576,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/package.json", "start_line": 5, "end_line": 5, @@ -611,7 +611,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/regex.coffee", "start_line": 2, "end_line": 2, @@ -627,7 +627,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 1, "end_line": 1, @@ -643,7 +643,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 5, "end_line": 21, @@ -690,7 +690,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "unknown-ref-to-key-file-root/test/index.js", "start_line": 2, "end_line": 2, @@ -706,7 +706,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 1, "end_line": 1, @@ -722,7 +722,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unknown-ref-to-key-file-root/LICENSE", "start_line": 5, "end_line": 21, diff --git a/tests/licensedcode/data/plugin_license/license_url/license_url.expected.json b/tests/licensedcode/data/plugin_license/license_url/license_url.expected.json index 1fdbc5ddfb..b2414dce6a 100644 --- a/tests/licensedcode/data/plugin_license/license_url/license_url.expected.json +++ b/tests/licensedcode/data/plugin_license/license_url/license_url.expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "apache-1.0", - "spdx_license_expression": "Apache-1.0", + "license_expression_spdx": "Apache-1.0", "from_file": "scan/apache-1.0.txt", "start_line": 4, "end_line": 54, diff --git a/tests/licensedcode/data/plugin_license/mock_index/scan-unknown-intro-eclipse-foundation.expected.json b/tests/licensedcode/data/plugin_license/mock_index/scan-unknown-intro-eclipse-foundation.expected.json index 8b48d43f71..ba9af21d3e 100644 --- a/tests/licensedcode/data/plugin_license/mock_index/scan-unknown-intro-eclipse-foundation.expected.json +++ b/tests/licensedcode/data/plugin_license/mock_index/scan-unknown-intro-eclipse-foundation.expected.json @@ -5,7 +5,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": null, "start_line": 4, "end_line": 5, @@ -20,7 +20,7 @@ }, { "license_expression": "epl-2.0", - "spdx_license_expression": "EPL-2.0", + "license_expression_spdx": "EPL-2.0", "from_file": null, "start_line": 5, "end_line": 5, @@ -35,7 +35,7 @@ }, { "license_expression": "epl-2.0", - "spdx_license_expression": "EPL-2.0", + "license_expression_spdx": "EPL-2.0", "from_file": null, "start_line": 6, "end_line": 6, @@ -50,7 +50,7 @@ }, { "license_expression": "epl-2.0", - "spdx_license_expression": "EPL-2.0", + "license_expression_spdx": "EPL-2.0", "from_file": null, "start_line": 8, "end_line": 8, diff --git a/tests/licensedcode/data/plugin_license/package/package.expected.json b/tests/licensedcode/data/plugin_license/package/package.expected.json index fc4cb9d7a4..b8e1964822 100644 --- a/tests/licensedcode/data/plugin_license/package/package.expected.json +++ b/tests/licensedcode/data/plugin_license/package/package.expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package.json", "start_line": 1, "end_line": 1, @@ -218,7 +218,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package.json", "start_line": 1, "end_line": 1, @@ -292,7 +292,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package.json", "start_line": 15, "end_line": 15, diff --git a/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json b/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json index f8393eeead..e2fb0c8295 100644 --- a/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json +++ b/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json @@ -33,7 +33,7 @@ "license_clues": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "e2fsprogs/e2fsprogs-copyright", "start_line": 19, "end_line": 20, @@ -61,7 +61,7 @@ "matches": [ { "license_expression": "gpl-2.0 AND patent-disclaimer", - "spdx_license_expression": "GPL-2.0-only AND LicenseRef-scancode-patent-disclaimer", + "license_expression_spdx": "GPL-2.0-only AND LicenseRef-scancode-patent-disclaimer", "from_file": "e2fsprogs/e2fsprogs-fsstress", "start_line": 4, "end_line": 30, diff --git a/tests/licensedcode/data/plugin_license/scan/ffmpeg-license.expected.json b/tests/licensedcode/data/plugin_license/scan/ffmpeg-license.expected.json index a2c4b775c0..06dec2a848 100644 --- a/tests/licensedcode/data/plugin_license/scan/ffmpeg-license.expected.json +++ b/tests/licensedcode/data/plugin_license/scan/ffmpeg-license.expected.json @@ -303,7 +303,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus AND other-permissive AND gpl-2.0-plus", - "spdx_license_expression": "LGPL-2.1-or-later AND LicenseRef-scancode-other-permissive AND GPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.1-or-later AND LicenseRef-scancode-other-permissive AND GPL-2.0-or-later", "from_file": "ffmpeg-LICENSE.md", "start_line": 3, "end_line": 13, @@ -327,7 +327,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "ffmpeg-LICENSE.md", "start_line": 54, "end_line": 54, @@ -343,7 +343,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "ffmpeg-LICENSE.md", "start_line": 55, "end_line": 55, @@ -359,7 +359,7 @@ }, { "license_expression": "lgpl-3.0 AND gpl-3.0", - "spdx_license_expression": "LGPL-3.0-only AND GPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only AND GPL-3.0-only", "from_file": "ffmpeg-LICENSE.md", "start_line": 56, "end_line": 57, @@ -383,7 +383,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "ffmpeg-LICENSE.md", "start_line": 59, "end_line": 59, @@ -399,7 +399,7 @@ }, { "license_expression": "ijg", - "spdx_license_expression": "IJG", + "license_expression_spdx": "IJG", "from_file": "ffmpeg-LICENSE.md", "start_line": 62, "end_line": 63, @@ -415,7 +415,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "ffmpeg-LICENSE.md", "start_line": 67, "end_line": 67, @@ -441,7 +441,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "ffmpeg-LICENSE.md", "start_line": 79, "end_line": 79, @@ -465,7 +465,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "ffmpeg-LICENSE.md", "start_line": 88, "end_line": 89, @@ -481,7 +481,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "ffmpeg-LICENSE.md", "start_line": 91, "end_line": 91, @@ -497,7 +497,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "ffmpeg-LICENSE.md", "start_line": 94, "end_line": 94, @@ -521,7 +521,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "ffmpeg-LICENSE.md", "start_line": 100, "end_line": 100, @@ -537,7 +537,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "ffmpeg-LICENSE.md", "start_line": 101, "end_line": 101, @@ -561,7 +561,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "ffmpeg-LICENSE.md", "start_line": 104, "end_line": 104, @@ -583,7 +583,7 @@ "license_clues": [ { "license_expression": "proprietary-license", - "spdx_license_expression": "LicenseRef-scancode-proprietary-license", + "license_expression_spdx": "LicenseRef-scancode-proprietary-license", "from_file": "ffmpeg-LICENSE.md", "start_line": 102, "end_line": 102, diff --git a/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json b/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json index 0cacc4cae5..d68f7ab588 100644 --- a/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json +++ b/tests/licensedcode/data/plugin_license/sqlite/sqlite.expected.json @@ -48,7 +48,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 30, "end_line": 35, @@ -71,7 +71,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 54, "end_line": 59, @@ -94,7 +94,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 77, "end_line": 82, @@ -117,7 +117,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 100, "end_line": 105, @@ -140,7 +140,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 123, "end_line": 128, @@ -163,7 +163,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 146, "end_line": 151, @@ -186,7 +186,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 169, "end_line": 174, @@ -209,7 +209,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 192, "end_line": 197, @@ -232,7 +232,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 215, "end_line": 220, @@ -255,7 +255,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 238, "end_line": 243, @@ -278,7 +278,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 261, "end_line": 266, @@ -301,7 +301,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 284, "end_line": 289, @@ -324,7 +324,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 307, "end_line": 312, @@ -347,7 +347,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 330, "end_line": 335, @@ -370,7 +370,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 353, "end_line": 358, @@ -393,7 +393,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 376, "end_line": 381, @@ -416,7 +416,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 399, "end_line": 404, @@ -439,7 +439,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 422, "end_line": 427, @@ -462,7 +462,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 445, "end_line": 450, @@ -485,7 +485,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 468, "end_line": 473, @@ -508,7 +508,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 491, "end_line": 496, @@ -531,7 +531,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 514, "end_line": 519, @@ -554,7 +554,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 537, "end_line": 542, @@ -577,7 +577,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 560, "end_line": 565, @@ -600,7 +600,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 583, "end_line": 588, @@ -623,7 +623,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 606, "end_line": 611, @@ -646,7 +646,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 629, "end_line": 634, @@ -669,7 +669,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 652, "end_line": 657, @@ -692,7 +692,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 675, "end_line": 680, @@ -715,7 +715,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 698, "end_line": 703, @@ -738,7 +738,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 721, "end_line": 726, @@ -761,7 +761,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 744, "end_line": 749, @@ -784,7 +784,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 767, "end_line": 772, @@ -807,7 +807,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 790, "end_line": 795, @@ -830,7 +830,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 813, "end_line": 818, @@ -853,7 +853,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 836, "end_line": 841, @@ -876,7 +876,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 859, "end_line": 864, @@ -899,7 +899,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 882, "end_line": 887, @@ -922,7 +922,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 905, "end_line": 910, @@ -945,7 +945,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 928, "end_line": 933, @@ -968,7 +968,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 951, "end_line": 956, @@ -991,7 +991,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 974, "end_line": 979, @@ -1014,7 +1014,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 997, "end_line": 1002, @@ -1037,7 +1037,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1020, "end_line": 1025, @@ -1060,7 +1060,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1043, "end_line": 1048, @@ -1083,7 +1083,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1066, "end_line": 1071, @@ -1106,7 +1106,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1089, "end_line": 1094, @@ -1129,7 +1129,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1112, "end_line": 1117, @@ -1152,7 +1152,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1135, "end_line": 1140, @@ -1175,7 +1175,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1158, "end_line": 1163, @@ -1198,7 +1198,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1181, "end_line": 1186, @@ -1221,7 +1221,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1204, "end_line": 1209, @@ -1244,7 +1244,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1227, "end_line": 1232, @@ -1267,7 +1267,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1250, "end_line": 1255, @@ -1290,7 +1290,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1273, "end_line": 1278, @@ -1313,7 +1313,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1296, "end_line": 1301, @@ -1336,7 +1336,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1319, "end_line": 1324, @@ -1359,7 +1359,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1342, "end_line": 1347, @@ -1382,7 +1382,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1365, "end_line": 1370, @@ -1405,7 +1405,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1388, "end_line": 1393, @@ -1428,7 +1428,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1411, "end_line": 1416, @@ -1451,7 +1451,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1434, "end_line": 1439, @@ -1474,7 +1474,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1457, "end_line": 1462, @@ -1497,7 +1497,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1480, "end_line": 1485, @@ -1520,7 +1520,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1503, "end_line": 1508, @@ -1543,7 +1543,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1526, "end_line": 1531, @@ -1566,7 +1566,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1549, "end_line": 1554, @@ -1589,7 +1589,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1572, "end_line": 1577, @@ -1612,7 +1612,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1595, "end_line": 1600, @@ -1635,7 +1635,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1618, "end_line": 1623, @@ -1658,7 +1658,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1641, "end_line": 1646, @@ -1681,7 +1681,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1664, "end_line": 1669, @@ -1704,7 +1704,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1687, "end_line": 1692, @@ -1727,7 +1727,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1710, "end_line": 1715, @@ -1750,7 +1750,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1733, "end_line": 1738, @@ -1773,7 +1773,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1756, "end_line": 1761, @@ -1796,7 +1796,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1779, "end_line": 1784, @@ -1819,7 +1819,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1802, "end_line": 1807, @@ -1842,7 +1842,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1825, "end_line": 1830, @@ -1865,7 +1865,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1848, "end_line": 1853, @@ -1888,7 +1888,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1871, "end_line": 1876, @@ -1911,7 +1911,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1894, "end_line": 1899, @@ -1934,7 +1934,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1917, "end_line": 1922, @@ -1957,7 +1957,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1940, "end_line": 1945, @@ -1980,7 +1980,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1963, "end_line": 1968, @@ -2003,7 +2003,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 1986, "end_line": 1991, @@ -2026,7 +2026,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2009, "end_line": 2014, @@ -2049,7 +2049,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2032, "end_line": 2037, @@ -2072,7 +2072,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2055, "end_line": 2060, @@ -2095,7 +2095,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2078, "end_line": 2083, @@ -2118,7 +2118,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2101, "end_line": 2106, @@ -2141,7 +2141,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2124, "end_line": 2129, @@ -2164,7 +2164,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2147, "end_line": 2152, @@ -2187,7 +2187,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2170, "end_line": 2175, @@ -2210,7 +2210,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2193, "end_line": 2198, @@ -2233,7 +2233,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2216, "end_line": 2221, @@ -2256,7 +2256,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2239, "end_line": 2244, @@ -2279,7 +2279,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2262, "end_line": 2267, @@ -2302,7 +2302,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2285, "end_line": 2290, @@ -2325,7 +2325,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2308, "end_line": 2313, @@ -2348,7 +2348,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2331, "end_line": 2336, @@ -2371,7 +2371,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2354, "end_line": 2359, @@ -2394,7 +2394,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2377, "end_line": 2382, @@ -2417,7 +2417,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2400, "end_line": 2405, @@ -2440,7 +2440,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2423, "end_line": 2428, @@ -2463,7 +2463,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2446, "end_line": 2451, @@ -2486,7 +2486,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2469, "end_line": 2474, @@ -2509,7 +2509,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2492, "end_line": 2497, @@ -2532,7 +2532,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2515, "end_line": 2520, @@ -2555,7 +2555,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2538, "end_line": 2543, @@ -2578,7 +2578,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2561, "end_line": 2566, @@ -2601,7 +2601,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2584, "end_line": 2589, @@ -2624,7 +2624,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2607, "end_line": 2612, @@ -2647,7 +2647,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2630, "end_line": 2635, @@ -2670,7 +2670,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2653, "end_line": 2658, @@ -2693,7 +2693,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2676, "end_line": 2681, @@ -2716,7 +2716,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2699, "end_line": 2704, @@ -2739,7 +2739,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2722, "end_line": 2727, @@ -2762,7 +2762,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2745, "end_line": 2750, @@ -2785,7 +2785,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2768, "end_line": 2773, @@ -2808,7 +2808,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2791, "end_line": 2796, @@ -2831,7 +2831,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2814, "end_line": 2819, @@ -2854,7 +2854,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2837, "end_line": 2842, @@ -2877,7 +2877,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2860, "end_line": 2865, @@ -2900,7 +2900,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2883, "end_line": 2888, @@ -2923,7 +2923,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2906, "end_line": 2911, @@ -2946,7 +2946,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2929, "end_line": 2934, @@ -2969,7 +2969,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2952, "end_line": 2957, @@ -2992,7 +2992,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2975, "end_line": 2980, @@ -3015,7 +3015,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 2998, "end_line": 3003, @@ -3038,7 +3038,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 3021, "end_line": 3026, @@ -3061,7 +3061,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 3044, "end_line": 3049, @@ -3084,7 +3084,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 3067, "end_line": 3072, @@ -3107,7 +3107,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 3090, "end_line": 3095, @@ -3130,7 +3130,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 3113, "end_line": 3118, @@ -3153,7 +3153,7 @@ "matches": [ { "license_expression": "blessing", - "spdx_license_expression": "blessing", + "license_expression_spdx": "blessing", "from_file": "sqlite.tgz/sqlite3-binding2.c", "start_line": 3136, "end_line": 3141, diff --git a/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json b/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json index 121abb2509..b886ef54ba 100644 --- a/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json +++ b/tests/licensedcode/data/plugin_license/text/scan-diag.expected.json @@ -64,7 +64,7 @@ "matches": [ { "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib", - "spdx_license_expression": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", + "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "start_line": 1, "end_line": 1, @@ -99,7 +99,7 @@ "matches": [ { "license_expression": "fsf-ap", - "spdx_license_expression": "FSFAP", + "license_expression_spdx": "FSFAP", "from_file": "scan/short-license", "start_line": 1, "end_line": 3, diff --git a/tests/licensedcode/data/plugin_license/text/scan.expected.json b/tests/licensedcode/data/plugin_license/text/scan.expected.json index 3eec66406e..73f6d2b958 100644 --- a/tests/licensedcode/data/plugin_license/text/scan.expected.json +++ b/tests/licensedcode/data/plugin_license/text/scan.expected.json @@ -62,7 +62,7 @@ "matches": [ { "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib", - "spdx_license_expression": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", + "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "start_line": 1, "end_line": 1, @@ -96,7 +96,7 @@ "matches": [ { "license_expression": "fsf-ap", - "spdx_license_expression": "FSFAP", + "license_expression_spdx": "FSFAP", "from_file": "scan/short-license", "start_line": 1, "end_line": 3, diff --git a/tests/licensedcode/data/plugin_license/text_long_lines/scan-diag.expected.json b/tests/licensedcode/data/plugin_license/text_long_lines/scan-diag.expected.json index c66391c04f..106e5f681d 100644 --- a/tests/licensedcode/data/plugin_license/text_long_lines/scan-diag.expected.json +++ b/tests/licensedcode/data/plugin_license/text_long_lines/scan-diag.expected.json @@ -64,7 +64,7 @@ "matches": [ { "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib", - "spdx_license_expression": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", + "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "start_line": 1, "end_line": 1, @@ -99,7 +99,7 @@ "matches": [ { "license_expression": "unlicense", - "spdx_license_expression": "Unlicense", + "license_expression_spdx": "Unlicense", "from_file": "scan/tocbot.js", "start_line": 89, "end_line": 89, diff --git a/tests/licensedcode/data/plugin_license/text_long_lines/scan.expected.json b/tests/licensedcode/data/plugin_license/text_long_lines/scan.expected.json index c66391c04f..106e5f681d 100644 --- a/tests/licensedcode/data/plugin_license/text_long_lines/scan.expected.json +++ b/tests/licensedcode/data/plugin_license/text_long_lines/scan.expected.json @@ -64,7 +64,7 @@ "matches": [ { "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib", - "spdx_license_expression": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", + "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "start_line": 1, "end_line": 1, @@ -99,7 +99,7 @@ "matches": [ { "license_expression": "unlicense", - "spdx_license_expression": "Unlicense", + "license_expression_spdx": "Unlicense", "from_file": "scan/tocbot.js", "start_line": 89, "end_line": 89, diff --git a/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-dual-license.expected.json b/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-dual-license.expected.json index b6da7a8057..b5c2e93576 100644 --- a/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-dual-license.expected.json +++ b/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-dual-license.expected.json @@ -89,7 +89,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "scan-unknown-intro-dual-license/README.md", "start_line": 43, "end_line": 43, @@ -105,7 +105,7 @@ }, { "license_expression": "wtfpl-2.0", - "spdx_license_expression": "WTFPL", + "license_expression_spdx": "WTFPL", "from_file": "scan-unknown-intro-dual-license/README.md", "start_line": 43, "end_line": 43, @@ -121,7 +121,7 @@ }, { "license_expression": "wtfpl-2.0", - "spdx_license_expression": "WTFPL", + "license_expression_spdx": "WTFPL", "from_file": "scan-unknown-intro-dual-license/README.md", "start_line": 43, "end_line": 43, @@ -137,7 +137,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan-unknown-intro-dual-license/README.md", "start_line": 43, "end_line": 43, diff --git a/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-eclipse-foundation-tycho.expected.json b/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-eclipse-foundation-tycho.expected.json index 18cb7a79fa..30461cca32 100644 --- a/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-eclipse-foundation-tycho.expected.json +++ b/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-eclipse-foundation-tycho.expected.json @@ -280,7 +280,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_1.html", "start_line": 12, "end_line": 25, @@ -304,7 +304,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_1.html", "start_line": 34, "end_line": 37, @@ -328,7 +328,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_1.html", "start_line": 44, "end_line": 47, @@ -363,7 +363,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "start_line": 12, "end_line": 25, @@ -387,7 +387,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "start_line": 34, "end_line": 37, @@ -411,7 +411,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "start_line": 44, "end_line": 47, @@ -435,7 +435,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "start_line": 53, "end_line": 54, @@ -459,7 +459,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "start_line": 59, "end_line": 60, @@ -483,7 +483,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "start_line": 65, "end_line": 66, @@ -507,7 +507,7 @@ "matches": [ { "license_expression": "epl-2.0", - "spdx_license_expression": "EPL-2.0", + "license_expression_spdx": "EPL-2.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html", "start_line": 71, "end_line": 72, @@ -542,7 +542,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html", "start_line": 12, "end_line": 25, @@ -566,7 +566,7 @@ "matches": [ { "license_expression": "cpl-1.0", - "spdx_license_expression": "CPL-1.0", + "license_expression_spdx": "CPL-1.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html", "start_line": 40, "end_line": 41, @@ -590,7 +590,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html", "start_line": 53, "end_line": 54, @@ -606,7 +606,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html", "start_line": 57, "end_line": 59, @@ -630,7 +630,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_3.html", "start_line": 64, "end_line": 85, @@ -665,7 +665,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_4.html", "start_line": 12, "end_line": 25, @@ -689,7 +689,7 @@ "matches": [ { "license_expression": "cpl-1.0", - "spdx_license_expression": "CPL-1.0", + "license_expression_spdx": "CPL-1.0", "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_4.html", "start_line": 39, "end_line": 41, diff --git a/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-eclipse-foundation.expected.json b/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-eclipse-foundation.expected.json index 95c5ee2e75..2c91eeab4d 100644 --- a/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-eclipse-foundation.expected.json +++ b/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-eclipse-foundation.expected.json @@ -55,7 +55,7 @@ "matches": [ { "license_expression": "epl-2.0", - "spdx_license_expression": "EPL-2.0", + "license_expression_spdx": "EPL-2.0", "from_file": "scan-unknown-intro-eclipse-foundation/README.md", "start_line": 4, "end_line": 6, @@ -71,7 +71,7 @@ }, { "license_expression": "epl-2.0", - "spdx_license_expression": "EPL-2.0", + "license_expression_spdx": "EPL-2.0", "from_file": "scan-unknown-intro-eclipse-foundation/README.md", "start_line": 8, "end_line": 8, diff --git a/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-long-gaps-between.expected.json b/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-long-gaps-between.expected.json index 4462d23922..9b2c8267d0 100644 --- a/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-long-gaps-between.expected.json +++ b/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-long-gaps-between.expected.json @@ -100,7 +100,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "scan-unknown-intro-long-gaps-between/LICENSE-dist.txt", "start_line": 1, "end_line": 1, @@ -116,7 +116,7 @@ }, { "license_expression": "x11-lucent", - "spdx_license_expression": "dtoa", + "license_expression_spdx": "dtoa", "from_file": "scan-unknown-intro-long-gaps-between/LICENSE-dist.txt", "start_line": 8, "end_line": 14, @@ -142,7 +142,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "scan-unknown-intro-long-gaps-between/LICENSE-dist.txt", "start_line": 18, "end_line": 18, @@ -158,7 +158,7 @@ }, { "license_expression": "bzip2-libbzip-2010", - "spdx_license_expression": "bzip2-1.0.6", + "license_expression_spdx": "bzip2-1.0.6", "from_file": "scan-unknown-intro-long-gaps-between/LICENSE-dist.txt", "start_line": 25, "end_line": 54, diff --git a/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-with-imperfect-matches.expected.json b/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-with-imperfect-matches.expected.json index fcbd3eaad2..2e5e170af6 100644 --- a/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-with-imperfect-matches.expected.json +++ b/tests/licensedcode/data/plugin_license/unknown_intro/scan-unknown-intro-with-imperfect-matches.expected.json @@ -105,7 +105,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "scan-unknown-intro-with-imperfect-matches/LICENSE.md", "start_line": 9, "end_line": 9, @@ -121,7 +121,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan-unknown-intro-with-imperfect-matches/LICENSE.md", "start_line": 11, "end_line": 11, @@ -137,7 +137,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan-unknown-intro-with-imperfect-matches/LICENSE.md", "start_line": 11, "end_line": 11, @@ -153,7 +153,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan-unknown-intro-with-imperfect-matches/LICENSE.md", "start_line": 13, "end_line": 13, @@ -169,7 +169,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan-unknown-intro-with-imperfect-matches/LICENSE.md", "start_line": 16, "end_line": 20, diff --git a/tests/licensedcode/data/plugin_license_policy/file_with_multiple_licenses.expected.json b/tests/licensedcode/data/plugin_license_policy/file_with_multiple_licenses.expected.json index fbf755b916..f8e19bbe57 100644 --- a/tests/licensedcode/data/plugin_license_policy/file_with_multiple_licenses.expected.json +++ b/tests/licensedcode/data/plugin_license_policy/file_with_multiple_licenses.expected.json @@ -66,7 +66,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "file_with_multiple_licenses.txt", "start_line": 1, "end_line": 3, @@ -80,7 +80,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "file_with_multiple_licenses.txt", "start_line": 3, "end_line": 3, diff --git a/tests/licensedcode/data/plugin_license_policy/policy-codebase.expected.json b/tests/licensedcode/data/plugin_license_policy/policy-codebase.expected.json index 7120bfe2ac..e9359dd7d6 100644 --- a/tests/licensedcode/data/plugin_license_policy/policy-codebase.expected.json +++ b/tests/licensedcode/data/plugin_license_policy/policy-codebase.expected.json @@ -200,7 +200,7 @@ "matches": [ { "license_expression": "broadcom-commercial", - "spdx_license_expression": "LicenseRef-scancode-broadcom-commercial", + "license_expression_spdx": "LicenseRef-scancode-broadcom-commercial", "from_file": "policy-codebase.tgz/policy-codebase/broadcom.txt", "start_line": 3, "end_line": 7, @@ -259,7 +259,7 @@ "matches": [ { "license_expression": "bsd-1988", - "spdx_license_expression": "LicenseRef-scancode-bsd-1988", + "license_expression_spdx": "LicenseRef-scancode-bsd-1988", "from_file": "policy-codebase.tgz/policy-codebase/bsd-1988.txt", "start_line": 4, "end_line": 14, @@ -318,7 +318,7 @@ "matches": [ { "license_expression": "esri-devkit", - "spdx_license_expression": "LicenseRef-scancode-esri-devkit", + "license_expression_spdx": "LicenseRef-scancode-esri-devkit", "from_file": "policy-codebase.tgz/policy-codebase/esri-devkit.txt", "start_line": 1, "end_line": 10, @@ -377,7 +377,7 @@ "matches": [ { "license_expression": "oracle-java-ee-sdk-2010", - "spdx_license_expression": "LicenseRef-scancode-oracle-java-ee-sdk-2010", + "license_expression_spdx": "LicenseRef-scancode-oracle-java-ee-sdk-2010", "from_file": "policy-codebase.tgz/policy-codebase/oracle-java-ee-sdk-2010.txt", "start_line": 1, "end_line": 89, @@ -436,7 +436,7 @@ "matches": [ { "license_expression": "rh-eula", - "spdx_license_expression": "LicenseRef-scancode-rh-eula", + "license_expression_spdx": "LicenseRef-scancode-rh-eula", "from_file": "policy-codebase.tgz/policy-codebase/rh-eula.txt", "start_line": 1, "end_line": 124, diff --git a/tests/licensedcode/data/plugin_license_text/scan.expected.json b/tests/licensedcode/data/plugin_license_text/scan.expected.json index 39b925f9bb..9db04526ab 100644 --- a/tests/licensedcode/data/plugin_license_text/scan.expected.json +++ b/tests/licensedcode/data/plugin_license_text/scan.expected.json @@ -159,7 +159,7 @@ "matches": [ { "license_expression": "apache-1.0", - "spdx_license_expression": "Apache-1.0", + "license_expression_spdx": "Apache-1.0", "from_file": "scan/apache-1.0.txt", "start_line": 8, "end_line": 58, @@ -213,7 +213,7 @@ "matches": [ { "license_expression": "apache-1.0", - "spdx_license_expression": "Apache-1.0", + "license_expression_spdx": "Apache-1.0", "from_file": "scan/apache-with_extra.txt", "start_line": 40, "end_line": 90, @@ -267,7 +267,7 @@ "matches": [ { "license_expression": "ja-sig", - "spdx_license_expression": "LicenseRef-scancode-ja-sig", + "license_expression_spdx": "LicenseRef-scancode-ja-sig", "from_file": "scan/copyr.java", "start_line": 4, "end_line": 13, @@ -291,7 +291,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan/copyr.java", "start_line": 18, "end_line": 31, @@ -345,7 +345,7 @@ "matches": [ { "license_expression": "gpl-2.0 WITH linux-syscall-exception-gpl OR linux-openib", - "spdx_license_expression": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", + "license_expression_spdx": "GPL-2.0-only WITH Linux-syscall-note OR Linux-OpenIB", "from_file": "scan/gpl-2.0_with_linux-syscall-note_or_linux-openib_SPDX.RULE", "start_line": 1, "end_line": 1, @@ -399,7 +399,7 @@ "matches": [ { "license_expression": "ja-sig", - "spdx_license_expression": "LicenseRef-scancode-ja-sig", + "license_expression_spdx": "LicenseRef-scancode-ja-sig", "from_file": "scan/this.java", "start_line": 4, "end_line": 13, @@ -423,7 +423,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan/this.java", "start_line": 18, "end_line": 31, diff --git a/tests/packagedcode/data/about/aboutfiles.expected.json b/tests/packagedcode/data/about/aboutfiles.expected.json index 32ccccdef3..e3897e3ff8 100644 --- a/tests/packagedcode/data/about/aboutfiles.expected.json +++ b/tests/packagedcode/data/about/aboutfiles.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "aboutfiles/apipkg.ABOUT", "start_line": 1, "end_line": 1, @@ -120,7 +120,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "aboutfiles/appdirs.ABOUT", "start_line": 1, "end_line": 1, @@ -234,7 +234,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "aboutfiles/apipkg.ABOUT", "start_line": 1, "end_line": 1, @@ -329,7 +329,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "aboutfiles/appdirs.ABOUT", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/about/apipkg.ABOUT-expected b/tests/packagedcode/data/about/apipkg.ABOUT-expected index e48dad0c64..89b6b999bd 100644 --- a/tests/packagedcode/data/about/apipkg.ABOUT-expected +++ b/tests/packagedcode/data/about/apipkg.ABOUT-expected @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/about/appdirs.ABOUT-expected b/tests/packagedcode/data/about/appdirs.ABOUT-expected index c81d2810d4..1387997e6d 100644 --- a/tests/packagedcode/data/about/appdirs.ABOUT-expected +++ b/tests/packagedcode/data/about/appdirs.ABOUT-expected @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-get-installed-expected.json b/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-get-installed-expected.json index 1a8fe42f78..87ec9a99b6 100644 --- a/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-get-installed-expected.json +++ b/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-get-installed-expected.json @@ -42,7 +42,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -256,7 +256,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -362,7 +362,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -513,7 +513,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -727,7 +727,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1184,7 +1184,7 @@ "matches": [ { "license_expression": "mpl-2.0 AND mit", - "spdx_license_expression": "MPL-2.0 AND MIT", + "license_expression_spdx": "MPL-2.0 AND MIT", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1290,7 +1290,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1486,7 +1486,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1592,7 +1592,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1686,7 +1686,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1792,7 +1792,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1895,7 +1895,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1989,7 +1989,7 @@ "matches": [ { "license_expression": "mit AND bsd-new AND gpl-2.0-plus", - "spdx_license_expression": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", + "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -2119,7 +2119,7 @@ "matches": [ { "license_expression": "bsd-simplified AND bsd-new", - "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause", + "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-scan-expected.json b/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-scan-expected.json index 0e18735d5b..aa002b2181 100644 --- a/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-scan-expected.json +++ b/tests/packagedcode/data/alpine/alpine-container-layer.tar.xz-scan-expected.json @@ -43,7 +43,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -138,7 +138,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -233,7 +233,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -328,7 +328,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -441,7 +441,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -698,7 +698,7 @@ "matches": [ { "license_expression": "mpl-2.0 AND mit", - "spdx_license_expression": "MPL-2.0 AND MIT", + "license_expression_spdx": "MPL-2.0 AND MIT", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -793,7 +793,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -897,7 +897,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -992,7 +992,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1075,7 +1075,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1170,7 +1170,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1253,7 +1253,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1336,7 +1336,7 @@ "matches": [ { "license_expression": "mit AND bsd-new AND gpl-2.0-plus", - "spdx_license_expression": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", + "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1419,7 +1419,7 @@ "matches": [ { "license_expression": "bsd-simplified AND bsd-new", - "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause", + "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -2251,7 +2251,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -2457,7 +2457,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -2555,7 +2555,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -2698,7 +2698,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -2916,7 +2916,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3365,7 +3365,7 @@ "matches": [ { "license_expression": "mpl-2.0 AND mit", - "spdx_license_expression": "MPL-2.0 AND MIT", + "license_expression_spdx": "MPL-2.0 AND MIT", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3463,7 +3463,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3651,7 +3651,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3749,7 +3749,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3838,7 +3838,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3936,7 +3936,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -4057,7 +4057,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -4146,7 +4146,7 @@ "matches": [ { "license_expression": "mit AND bsd-new AND gpl-2.0-plus", - "spdx_license_expression": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", + "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -4283,7 +4283,7 @@ "matches": [ { "license_expression": "bsd-simplified AND bsd-new", - "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause", + "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause", "from_file": "alpine-container-layer.tar.xz/lib/apk/db/installed", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/bluedevil/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/bluedevil/APKBUILD-expected.json index 4de792e943..9f13662eec 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/bluedevil/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/bluedevil/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND lgpl-2.0-plus AND (lgpl-2.1 OR lgpl-3.0)", - "spdx_license_expression": "GPL-2.0-or-later AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only)", + "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-grub/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-grub/APKBUILD-expected.json index 5c04bb8b0a..39adc33298 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-grub/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-grub/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-gtk/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-gtk/APKBUILD-expected.json index c00b892cc4..794478fa7e 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-gtk/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-gtk/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-plymouth/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-plymouth/APKBUILD-expected.json index bb512cb079..b3fb661453 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-plymouth/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze-plymouth/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze/APKBUILD-expected.json index d3052dba4f..f2607c66b7 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/breeze/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/discover/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/discover/APKBUILD-expected.json index 2d129366bf..aced55084e 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/discover/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/discover/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND gfdl-1.2", - "spdx_license_expression": "LGPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND GFDL-1.2-only", + "license_expression_spdx": "LGPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND GFDL-1.2-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/drkonqi/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/drkonqi/APKBUILD-expected.json index 76e7370ecf..f068725bc8 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/drkonqi/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/drkonqi/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-lts/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-lts/APKBUILD-expected.json index c78c73cb23..9d5a56e820 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-lts/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-lts/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-rpi/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-rpi/APKBUILD-expected.json index c78c73cb23..9d5a56e820 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-rpi/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/jool-modules-rpi/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kactivitymanagerd/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kactivitymanagerd/APKBUILD-expected.json index 306b4e3729..95f8757539 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kactivitymanagerd/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kactivitymanagerd/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0 OR gpl-3.0", - "spdx_license_expression": "GPL-2.0-only OR GPL-3.0-only", + "license_expression_spdx": "GPL-2.0-only OR GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-cli-tools/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-cli-tools/APKBUILD-expected.json index 4ce7fc67e1..aef6549beb 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-cli-tools/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-cli-tools/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "(gpl-2.0 OR gpl-3.0) AND gpl-2.0-plus AND gpl-2.0 AND lgpl-2.1", - "spdx_license_expression": "(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0-or-later AND GPL-2.0-only AND LGPL-2.1-only", + "license_expression_spdx": "(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0-or-later AND GPL-2.0-only AND LGPL-2.1-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-gtk-config/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-gtk-config/APKBUILD-expected.json index a496ba2492..61565b8b9b 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-gtk-config/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kde-gtk-config/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "(gpl-2.0 AND lgpl-2.1) OR lgpl-3.0", - "spdx_license_expression": "(GPL-2.0-only AND LGPL-2.1-only) OR LGPL-3.0-only", + "license_expression_spdx": "(GPL-2.0-only AND LGPL-2.1-only) OR LGPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdecoration/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdecoration/APKBUILD-expected.json index baad8dfc77..32ed4abd0a 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdecoration/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdecoration/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1 OR lgpl-3.0", - "spdx_license_expression": "LGPL-2.1-only OR LGPL-3.0-only", + "license_expression_spdx": "LGPL-2.1-only OR LGPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdeplasma-addons/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdeplasma-addons/APKBUILD-expected.json index c415f47ec4..771640bf77 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdeplasma-addons/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kdeplasma-addons/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.0 AND gpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-only AND GPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-only AND GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kgamma5/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kgamma5/APKBUILD-expected.json index 1f004e7dd1..cb4feaa730 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kgamma5/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kgamma5/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/khotkeys/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/khotkeys/APKBUILD-expected.json index b6860a41dd..6f6e7ac789 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/khotkeys/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/khotkeys/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0 AND lgpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-only AND LGPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-only AND LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kinfocenter/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kinfocenter/APKBUILD-expected.json index 76360ae163..16131a11a8 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kinfocenter/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kinfocenter/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "(gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 OR lgpl-3.0)", - "spdx_license_expression": "(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)", + "license_expression_spdx": "(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kmenuedit/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kmenuedit/APKBUILD-expected.json index 6c56af5ada..6a05906d6a 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kmenuedit/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kmenuedit/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreen/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreen/APKBUILD-expected.json index 9f7b08e078..70e3c7791b 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreen/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreen/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND lgpl-2.1-plus", - "spdx_license_expression": "GPL-2.0-or-later AND LGPL-2.1-or-later", + "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreenlocker/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreenlocker/APKBUILD-expected.json index cd993d952b..d7bddd3e6c 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreenlocker/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kscreenlocker/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)", - "spdx_license_expression": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)", + "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ksshaskpass/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ksshaskpass/APKBUILD-expected.json index b1d6608d46..70b4276aa2 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ksshaskpass/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ksshaskpass/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwallet-pam/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwallet-pam/APKBUILD-expected.json index 116d852b07..f8a4c2f169 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwallet-pam/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwallet-pam/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-integration/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-integration/APKBUILD-expected.json index 5fde01d4e4..583bec8aab 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-integration/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-integration/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1 OR lgpl-3.0", - "spdx_license_expression": "LGPL-2.1-only OR LGPL-3.0-only", + "license_expression_spdx": "LGPL-2.1-only OR LGPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-server/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-server/APKBUILD-expected.json index aa07ea3233..096c4b89d4 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-server/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwayland-server/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1", - "spdx_license_expression": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-only", + "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwin/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwin/APKBUILD-expected.json index 55b54e55bf..dfc5775a2e 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwin/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwin/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1", - "spdx_license_expression": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-only", + "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwrited/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwrited/APKBUILD-expected.json index f472b38748..5a8657d348 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwrited/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/kwrited/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/layer-shell-qt/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/layer-shell-qt/APKBUILD-expected.json index cae2b41d2e..cbfcf7f102 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/layer-shell-qt/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/layer-shell-qt/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)", - "spdx_license_expression": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)", + "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libkscreen/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libkscreen/APKBUILD-expected.json index cf7bab1115..5cb38e3618 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libkscreen/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libkscreen/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus AND gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0)", - "spdx_license_expression": "LGPL-2.1-or-later AND GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)", + "license_expression_spdx": "LGPL-2.1-or-later AND GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libksysguard/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libksysguard/APKBUILD-expected.json index 90061bace9..d4f809009d 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libksysguard/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libksysguard/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus AND (gpl-2.0 OR gpl-3.0)", - "spdx_license_expression": "LGPL-2.1-or-later AND (GPL-2.0-only OR GPL-3.0-only)", + "license_expression_spdx": "LGPL-2.1-or-later AND (GPL-2.0-only OR GPL-3.0-only)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libreoffice/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libreoffice/APKBUILD-expected.json index f84d9f342e..6d4e0abafb 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libreoffice/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/libreoffice/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/milou/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/milou/APKBUILD-expected.json index 911cc9e34b..8567dae940 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/milou/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/milou/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 OR lgpl-3.0)", - "spdx_license_expression": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)", + "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/mpd/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/mpd/APKBUILD-expected.json index 71730b0573..913df7481c 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/mpd/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/mpd/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/oxygen/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/oxygen/APKBUILD-expected.json index dee53ed303..1711fd7c28 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/oxygen/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/oxygen/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/parole/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/parole/APKBUILD-expected.json index 276c3049b5..8555584411 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/parole/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/parole/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-browser-integration/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-browser-integration/APKBUILD-expected.json index c04df6d899..e3c187ac35 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-browser-integration/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-browser-integration/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-desktop/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-desktop/APKBUILD-expected.json index b6e4f1d308..3b553a1586 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-desktop/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-desktop/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0 AND lgpl-2.1", - "spdx_license_expression": "GPL-2.0-only AND LGPL-2.1-only", + "license_expression_spdx": "GPL-2.0-only AND LGPL-2.1-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-disks/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-disks/APKBUILD-expected.json index 6217828419..db2908a700 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-disks/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-disks/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-firewall/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-firewall/APKBUILD-expected.json index 46c30db392..3f195e615c 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-firewall/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-firewall/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-integration/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-integration/APKBUILD-expected.json index 748794161a..58b91b98a0 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-integration/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-integration/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "(lgpl-2.1 OR lgpl-3.0) AND lgpl-2.1 AND (lgpl-2.1 WITH qt-lgpl-exception-1.1 OR gpl-3.0 WITH qt-lgpl-exception-1.1)", - "spdx_license_expression": "(LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.1-only AND (LGPL-2.1-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-LGPL-exception-1.1)", + "license_expression_spdx": "(LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.1-only AND (LGPL-2.1-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-LGPL-exception-1.1)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nano/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nano/APKBUILD-expected.json index a7fab4c722..93346a0f69 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nano/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nano/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND lgpl-2.1-plus", - "spdx_license_expression": "GPL-2.0-or-later AND LGPL-2.1-or-later", + "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nm/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nm/APKBUILD-expected.json index 9f26af9e0f..113fe4ad64 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nm/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-nm/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "(lgpl-2.1 OR lgpl-3.0) AND lgpl-2.0-plus", - "spdx_license_expression": "(LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-or-later", + "license_expression_spdx": "(LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-pa/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-pa/APKBUILD-expected.json index 0ead5d3077..b558772f41 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-pa/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-pa/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1 OR (lgpl-3.0 AND gpl-2.0)", - "spdx_license_expression": "LGPL-2.1-only OR (LGPL-3.0-only AND GPL-2.0-only)", + "license_expression_spdx": "LGPL-2.1-only OR (LGPL-3.0-only AND GPL-2.0-only)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-phone-components/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-phone-components/APKBUILD-expected.json index a1ad364d10..deabe06593 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-phone-components/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-phone-components/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND lgpl-2.1-plus", - "spdx_license_expression": "GPL-2.0-or-later AND LGPL-2.1-or-later", + "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-sdk/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-sdk/APKBUILD-expected.json index c730a12ea7..a26e251693 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-sdk/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-sdk/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-systemmonitor/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-systemmonitor/APKBUILD-expected.json index 8f7e0b1f2f..d15e8ba376 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-systemmonitor/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-systemmonitor/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "kde-accepted-gpl AND kde-accepted-lgpl AND cc0-1.0", - "spdx_license_expression": "LicenseRef-scancode-kde-accepted-gpl AND LicenseRef-scancode-kde-accepted-lgpl AND CC0-1.0", + "license_expression_spdx": "LicenseRef-scancode-kde-accepted-gpl AND LicenseRef-scancode-kde-accepted-lgpl AND CC0-1.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-thunderbolt/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-thunderbolt/APKBUILD-expected.json index 0f4929fedf..20cc4f03d5 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-thunderbolt/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-thunderbolt/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0 OR gpl-3.0", - "spdx_license_expression": "GPL-2.0-only OR GPL-3.0-only", + "license_expression_spdx": "GPL-2.0-only OR GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-vault/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-vault/APKBUILD-expected.json index 389e3990be..69c4fe17e7 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-vault/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-vault/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "(gpl-2.0 OR gpl-3.0) AND (lgpl-2.1 AND lgpl-3.0)", - "spdx_license_expression": "(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only AND LGPL-3.0-only)", + "license_expression_spdx": "(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only AND LGPL-3.0-only)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace-wallpapers/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace-wallpapers/APKBUILD-expected.json index 8e646e11d6..241d33c0cc 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace-wallpapers/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace-wallpapers/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace/APKBUILD-expected.json index 30588fe456..8ace341f2e 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plasma-workspace/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "(gpl-2.0 OR gpl-3.0) AND lgpl-2.1-plus AND gpl-2.0-plus AND mit AND lgpl-2.1 AND lgpl-2.0-plus AND (lgpl-2.1 OR lgpl-3.0) AND lgpl-2.0", - "spdx_license_expression": "(GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-or-later AND GPL-2.0-or-later AND MIT AND LGPL-2.1-only AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-only", + "license_expression_spdx": "(GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-or-later AND GPL-2.0-or-later AND MIT AND LGPL-2.1-only AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plymouth-kcm/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plymouth-kcm/APKBUILD-expected.json index b4758f3f0b..f075ac2c72 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plymouth-kcm/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/plymouth-kcm/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/polkit-kde-agent-1/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/polkit-kde-agent-1/APKBUILD-expected.json index 62988f0671..de9f352147 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/polkit-kde-agent-1/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/polkit-kde-agent-1/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/powerdevil/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/powerdevil/APKBUILD-expected.json index d05631bad9..12d9d7e9bf 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/powerdevil/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/powerdevil/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND lgpl-2.0-plus AND (lgpl-2.1 OR lgpl-3.0)", - "spdx_license_expression": "GPL-2.0-or-later AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only)", + "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.0-or-later AND (LGPL-2.1-only OR LGPL-3.0-only)", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qqc2-breeze-style/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qqc2-breeze-style/APKBUILD-expected.json index 65193c021c..02abcca36f 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qqc2-breeze-style/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qqc2-breeze-style/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "kde-accepted-lgpl AND kfqf-accepted-gpl", - "spdx_license_expression": "LicenseRef-scancode-kde-accepted-lgpl AND LicenseRef-scancode-kfqf-accepted-gpl", + "license_expression_spdx": "LicenseRef-scancode-kde-accepted-lgpl AND LicenseRef-scancode-kfqf-accepted-gpl", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qt6-qtbase/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qt6-qtbase/APKBUILD-expected.json index c94a533341..5e7ed0d652 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qt6-qtbase/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/qt6-qtbase/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1 AND lgpl-3.0 AND gpl-3.0 AND qt-gpl-exception-1.0", - "spdx_license_expression": "LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0", + "license_expression_spdx": "LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/rtpengine-lts/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/rtpengine-lts/APKBUILD-expected.json index 113c19e5fa..f5dcd3ee2a 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/rtpengine-lts/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/rtpengine-lts/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/sddm-kcm/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/sddm-kcm/APKBUILD-expected.json index 530ad4f7ad..4c6e1a0a2f 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/sddm-kcm/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/sddm-kcm/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND (gpl-2.0 OR gpl-3.0) AND lgpl-2.1-plus AND gpl-2.0", - "spdx_license_expression": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-or-later AND GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-or-later AND GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/systemsettings/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/systemsettings/APKBUILD-expected.json index 09a5ea9d7b..c6fe4dd342 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/systemsettings/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/systemsettings/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ufw/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ufw/APKBUILD-expected.json index 270633656d..dfca174e01 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ufw/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/ufw/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/xdg-desktop-portal-kde/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/xdg-desktop-portal-kde/APKBUILD-expected.json index a93db3e5f4..ad9acf08e3 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/xdg-desktop-portal-kde/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/community/xdg-desktop-portal-kde/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/cmake/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/cmake/APKBUILD-expected.json index 561a2aaf8b..cdb7076ce9 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/cmake/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/cmake/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/kamailio/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/kamailio/APKBUILD-expected.json index a4d6129d9e..7dafd9c24a 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/kamailio/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/kamailio/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/libburn/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/libburn/APKBUILD-expected.json index 320f58f78e..3c2d3f63f7 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/libburn/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/libburn/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-lts/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-lts/APKBUILD-expected.json index 701759a9ff..c12f65f53b 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-lts/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-lts/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-rpi/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-rpi/APKBUILD-expected.json index d9f6685a52..384d802eaa 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-rpi/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/linux-rpi/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/lua-unit/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/lua-unit/APKBUILD-expected.json index 65108b2b1d..036a77ec74 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/lua-unit/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/lua-unit/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "bsd-simplified", - "spdx_license_expression": "BSD-2-Clause", + "license_expression_spdx": "BSD-2-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite-tcl/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite-tcl/APKBUILD-expected.json index df5225a1ab..b7a63b3d3c 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite-tcl/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite-tcl/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite/APKBUILD-expected.json index b0dfbe393a..0cf90206d4 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqlite/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqsh/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqsh/APKBUILD-expected.json index f838b66f04..318def0894 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqsh/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqsh/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sudo/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sudo/APKBUILD-expected.json index 7463f552c8..79bd226698 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sudo/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sudo/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "unknown-license-reference AND isc", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference AND ISC", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference AND ISC", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/util-linux/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/util-linux/APKBUILD-expected.json index e234a3d139..842992da6c 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/util-linux/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/util-linux/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus AND gpl-2.0-plus AND gpl-2.0 AND lgpl-2.1-plus AND bsd-new AND bsd-original-uc AND public-domain", - "spdx_license_expression": "GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-2.0-only AND LGPL-2.1-or-later AND BSD-3-Clause AND BSD-4-Clause-UC AND LicenseRef-scancode-public-domain", + "license_expression_spdx": "GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-2.0-only AND LGPL-2.1-or-later AND BSD-3-Clause AND BSD-4-Clause-UC AND LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-edge/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-edge/APKBUILD-expected.json index 66ee2820ab..7b51e2eb43 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-edge/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-edge/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-elm/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-elm/APKBUILD-expected.json index 1e2323d6ed..979d6e4e01 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-elm/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-elm/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-gru/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-gru/APKBUILD-expected.json index 98d7d9a024..a71928e2ab 100644 --- a/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-gru/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild-problems/alpine14/testing/linux-gru/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/abook/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/abook/APKBUILD-expected.json index 1e99676e05..d2fbb13691 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/abook/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/abook/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/darktable/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/darktable/APKBUILD-expected.json index 33baed677c..4631a7e774 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/darktable/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/darktable/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/haxe/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/haxe/APKBUILD-expected.json index 8e25ce565c..8ddbabfead 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine13/community/haxe/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine13/community/haxe/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus AND mit AND lgpl-2.0-plus", - "spdx_license_expression": "GPL-1.0-or-later AND MIT AND LGPL-2.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later AND MIT AND LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine13/main/linux-firmware/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine13/main/linux-firmware/APKBUILD-expected.json index 0b32bce07c..c94cf26318 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine13/main/linux-firmware/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine13/main/linux-firmware/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/2bwm/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/2bwm/APKBUILD-expected.json index bfd86eadbd..7526726d06 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/2bwm/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/2bwm/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "isc", - "spdx_license_expression": "ISC", + "license_expression_spdx": "ISC", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/acccheck/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/acccheck/APKBUILD-expected.json index 5a4baeeece..be0667a014 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/acccheck/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/acccheck/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/accerciser/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/accerciser/APKBUILD-expected.json index a806b9b2f0..50cc16f10c 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/accerciser/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/accerciser/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/alpine/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/alpine/APKBUILD-expected.json index da93292e2f..d5633c3176 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/alpine/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/alpine/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/audacious-plugins/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/audacious-plugins/APKBUILD-expected.json index ae453f3cda..4579306956 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/audacious-plugins/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/audacious-plugins/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "bsd-simplified AND bsd-new AND isc AND gpl-2.0 AND gpl-2.0-plus AND gpl-3.0 AND gpl-3.0-plus", - "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause AND ISC AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later", + "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause AND ISC AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/boost-build/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/boost-build/APKBUILD-expected.json index 651899f02a..d1bb526e3f 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/boost-build/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/boost-build/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/dircproxy/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/dircproxy/APKBUILD-expected.json index 1cd2eae267..6c64174981 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/dircproxy/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/dircproxy/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/faac/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/faac/APKBUILD-expected.json index 208567ee4d..f08fa968ed 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/faac/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/faac/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/feedbackd-device-themes/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/feedbackd-device-themes/APKBUILD-expected.json index 50bf5bbfe3..5810a18814 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/feedbackd-device-themes/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/feedbackd-device-themes/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/gcc6/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/gcc6/APKBUILD-expected.json index ff2dd5a470..4fe01e2350 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/gcc6/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/gcc6/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus AND lgpl-2.0-plus", - "spdx_license_expression": "GPL-1.0-or-later AND LGPL-2.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later AND LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/hunspell-de-de/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/hunspell-de-de/APKBUILD-expected.json index f566134488..2171645c00 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/hunspell-de-de/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/hunspell-de-de/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick/APKBUILD-expected.json index 1b6182abae..70ebbf9ad0 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "imagemagick", - "spdx_license_expression": "ImageMagick", + "license_expression_spdx": "ImageMagick", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick6/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick6/APKBUILD-expected.json index 51057f1dee..6435d505c5 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick6/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/imagemagick6/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/libluv/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/libluv/APKBUILD-expected.json index d6a78548b9..5ea10ed4e0 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/libluv/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/libluv/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/nymphcast-client/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/nymphcast-client/APKBUILD-expected.json index d61e5bde16..74877b4692 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/nymphcast-client/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/nymphcast-client/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/openjdk10/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/openjdk10/APKBUILD-expected.json index eba5dce71c..64d46a2671 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/openjdk10/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/openjdk10/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "classpath-exception-2.0", - "spdx_license_expression": "Classpath-exception-2.0", + "license_expression_spdx": "Classpath-exception-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/py3-cairosvg/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/py3-cairosvg/APKBUILD-expected.json index ae3017afca..627fadb2ef 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/py3-cairosvg/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/py3-cairosvg/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/qt6-qt3d/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/qt6-qt3d/APKBUILD-expected.json index fcc3f77939..6d5fb9da4a 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/qt6-qt3d/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/qt6-qt3d/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1 AND lgpl-3.0 AND gpl-3.0 AND qt-gpl-exception-1.0", - "spdx_license_expression": "LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0", + "license_expression_spdx": "LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/ruby-rspec/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/ruby-rspec/APKBUILD-expected.json index 24e5a490ac..6f33ee03ec 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/ruby-rspec/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/ruby-rspec/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/unicode-character-database/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/unicode-character-database/APKBUILD-expected.json index ec959eb94e..50041b0358 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/unicode-character-database/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/unicode-character-database/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "unicode-dfs-2015", - "spdx_license_expression": "Unicode-DFS-2015", + "license_expression_spdx": "Unicode-DFS-2015", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/vtk/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/vtk/APKBUILD-expected.json index b398a5d228..8a45e5c4f9 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/vtk/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/vtk/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/zsnes/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/zsnes/APKBUILD-expected.json index 22832356a3..ea35bb1ec8 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/community/zsnes/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/community/zsnes/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/gcc/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/gcc/APKBUILD-expected.json index a634a451f6..ac85b71ce7 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/gcc/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/gcc/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus AND lgpl-2.1-plus", - "spdx_license_expression": "GPL-2.0-or-later AND LGPL-2.1-or-later", + "license_expression_spdx": "GPL-2.0-or-later AND LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/icu/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/icu/APKBUILD-expected.json index 56f42ae0ec..dc13166a6e 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/icu/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/icu/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "mit AND x11 AND unicode-tou", - "spdx_license_expression": "MIT AND ICU AND Unicode-TOU", + "license_expression_spdx": "MIT AND ICU AND Unicode-TOU", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/ruby/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/ruby/APKBUILD-expected.json index 5d42f65b67..ab12e43a78 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/main/ruby/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/main/ruby/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "ruby AND bsd-simplified AND mit", - "spdx_license_expression": "Ruby AND BSD-2-Clause AND MIT", + "license_expression_spdx": "Ruby AND BSD-2-Clause AND MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-dcontainers/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-dcontainers/APKBUILD-expected.json index cbcbab5359..971d4df11b 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-dcontainers/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-dcontainers/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-linux-firmware/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-linux-firmware/APKBUILD-expected.json index c3e2a1acef..ea361b19fb 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-linux-firmware/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-linux-firmware/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-lua-lustache/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-lua-lustache/APKBUILD-expected.json index d7a4c0f0ac..ea7dc29957 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-lua-lustache/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-lua-lustache/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-perl-socket-getaddrinfo/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-perl-socket-getaddrinfo/APKBUILD-expected.json index ab7166c031..d21ad5afec 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-perl-socket-getaddrinfo/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-perl-socket-getaddrinfo/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus OR artistic-perl-1.0", - "spdx_license_expression": "GPL-1.0-or-later OR Artistic-1.0-Perl", + "license_expression_spdx": "GPL-1.0-or-later OR Artistic-1.0-Perl", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-stdx-allocator/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-stdx-allocator/APKBUILD-expected.json index a6521a427c..fab5082e17 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-stdx-allocator/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand-stdx-allocator/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand_in_python-py3-cssselect2/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand_in_python-py3-cssselect2/APKBUILD-expected.json index 4209e5abb2..3e93e297f9 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand_in_python-py3-cssselect2/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/problems/nested_expand_in_python-py3-cssselect2/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gitlab-release-cli/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gitlab-release-cli/APKBUILD-expected.json index a8cde38958..a2ef57fc71 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gitlab-release-cli/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gitlab-release-cli/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gtksourceviewmm3/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gtksourceviewmm3/APKBUILD-expected.json index ca36b4124b..caa5b18a77 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gtksourceviewmm3/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/gtksourceviewmm3/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/pnmixer/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/pnmixer/APKBUILD-expected.json index 09e1a5b64c..374b69cd91 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/pnmixer/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/pnmixer/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/ubuntu-archive-keyring/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/ubuntu-archive-keyring/APKBUILD-expected.json index 7df8c1ec22..8668fe57f8 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/ubuntu-archive-keyring/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/testing/ubuntu-archive-keyring/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/apkbuild/alpine14/unmaintained/buildbot/APKBUILD-expected.json b/tests/packagedcode/data/alpine/apkbuild/alpine14/unmaintained/buildbot/APKBUILD-expected.json index 82c2b8be21..e080ad665b 100644 --- a/tests/packagedcode/data/alpine/apkbuild/alpine14/unmaintained/buildbot/APKBUILD-expected.json +++ b/tests/packagedcode/data/alpine/apkbuild/alpine14/unmaintained/buildbot/APKBUILD-expected.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/full-installed/installed-expected.json b/tests/packagedcode/data/alpine/full-installed/installed-expected.json index 1199b26c0d..b9cafee1b6 100644 --- a/tests/packagedcode/data/alpine/full-installed/installed-expected.json +++ b/tests/packagedcode/data/alpine/full-installed/installed-expected.json @@ -42,7 +42,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -140,7 +140,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -283,7 +283,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -606,7 +606,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -866,7 +866,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": null, "start_line": 1, "end_line": 1, @@ -1054,7 +1054,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": null, "start_line": 1, "end_line": 1, @@ -1152,7 +1152,7 @@ "matches": [ { "license_expression": "mpl-2.0 AND gpl-2.0-plus", - "spdx_license_expression": "MPL-2.0 AND GPL-2.0-or-later", + "license_expression_spdx": "MPL-2.0 AND GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -1242,7 +1242,7 @@ "matches": [ { "license_expression": "isc", - "spdx_license_expression": "ISC", + "license_expression_spdx": "ISC", "from_file": null, "start_line": 1, "end_line": 1, @@ -1352,7 +1352,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -1441,7 +1441,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": null, "start_line": 1, "end_line": 1, @@ -1539,7 +1539,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -1628,7 +1628,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -1717,7 +1717,7 @@ "matches": [ { "license_expression": "mit AND bsd-new AND gpl-2.0-plus", - "spdx_license_expression": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", + "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -1854,7 +1854,7 @@ "matches": [ { "license_expression": "bsd-simplified AND bsd-new", - "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause", + "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/rootfs/alpine-rootfs.tar.xz-expected.json b/tests/packagedcode/data/alpine/rootfs/alpine-rootfs.tar.xz-expected.json index 434479c96d..f1ab5891a1 100644 --- a/tests/packagedcode/data/alpine/rootfs/alpine-rootfs.tar.xz-expected.json +++ b/tests/packagedcode/data/alpine/rootfs/alpine-rootfs.tar.xz-expected.json @@ -43,7 +43,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -138,7 +138,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -233,7 +233,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -355,7 +355,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -612,7 +612,7 @@ "matches": [ { "license_expression": "mpl-2.0 AND mit", - "spdx_license_expression": "MPL-2.0 AND MIT", + "license_expression_spdx": "MPL-2.0 AND MIT", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -707,7 +707,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -829,7 +829,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -924,7 +924,7 @@ "matches": [ { "license_expression": "isc AND (bsd-new OR mit)", - "spdx_license_expression": "ISC AND (BSD-3-Clause OR MIT)", + "license_expression_spdx": "ISC AND (BSD-3-Clause OR MIT)", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1019,7 +1019,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1102,7 +1102,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1197,7 +1197,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1280,7 +1280,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1363,7 +1363,7 @@ "matches": [ { "license_expression": "mit AND bsd-new AND gpl-2.0-plus", - "spdx_license_expression": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", + "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -1446,7 +1446,7 @@ "matches": [ { "license_expression": "bsd-simplified AND bsd-new", - "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause", + "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -2237,7 +2237,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -2335,7 +2335,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -2478,7 +2478,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -2810,7 +2810,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3259,7 +3259,7 @@ "matches": [ { "license_expression": "mpl-2.0 AND mit", - "spdx_license_expression": "MPL-2.0 AND MIT", + "license_expression_spdx": "MPL-2.0 AND MIT", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3357,7 +3357,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3536,7 +3536,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3634,7 +3634,7 @@ "matches": [ { "license_expression": "isc AND (bsd-new OR mit)", - "spdx_license_expression": "ISC AND (BSD-3-Clause OR MIT)", + "license_expression_spdx": "ISC AND (BSD-3-Clause OR MIT)", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3744,7 +3744,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3833,7 +3833,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -3931,7 +3931,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -4052,7 +4052,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -4141,7 +4141,7 @@ "matches": [ { "license_expression": "mit AND bsd-new AND gpl-2.0-plus", - "spdx_license_expression": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", + "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, @@ -4278,7 +4278,7 @@ "matches": [ { "license_expression": "bsd-simplified AND bsd-new", - "spdx_license_expression": "BSD-2-Clause AND BSD-3-Clause", + "license_expression_spdx": "BSD-2-Clause AND BSD-3-Clause", "from_file": "alpine-rootfs/lib/apk/db/installed", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/single-installed/installed-expected.json b/tests/packagedcode/data/alpine/single-installed/installed-expected.json index 99d6f07846..3c497bdc06 100644 --- a/tests/packagedcode/data/alpine/single-installed/installed-expected.json +++ b/tests/packagedcode/data/alpine/single-installed/installed-expected.json @@ -42,7 +42,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/alpine/small-installed/installed-expected.json b/tests/packagedcode/data/alpine/small-installed/installed-expected.json index 1187637a3b..016961d5db 100644 --- a/tests/packagedcode/data/alpine/small-installed/installed-expected.json +++ b/tests/packagedcode/data/alpine/small-installed/installed-expected.json @@ -42,7 +42,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -140,7 +140,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -283,7 +283,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -606,7 +606,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -848,7 +848,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": null, "start_line": 1, "end_line": 1, @@ -1036,7 +1036,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": null, "start_line": 1, "end_line": 1, @@ -1134,7 +1134,7 @@ "matches": [ { "license_expression": "mpl-2.0 AND gpl-2.0-plus", - "spdx_license_expression": "MPL-2.0 AND GPL-2.0-or-later", + "license_expression_spdx": "MPL-2.0 AND GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -1215,7 +1215,7 @@ "matches": [ { "license_expression": "isc", - "spdx_license_expression": "ISC", + "license_expression_spdx": "ISC", "from_file": null, "start_line": 1, "end_line": 1, @@ -1325,7 +1325,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -1414,7 +1414,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": null, "start_line": 1, "end_line": 1, @@ -1512,7 +1512,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -1601,7 +1601,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -1690,7 +1690,7 @@ "matches": [ { "license_expression": "mit AND bsd-new AND gpl-2.0-plus", - "spdx_license_expression": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", + "license_expression_spdx": "MIT AND BSD-3-Clause AND GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -1827,7 +1827,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/bower/author-objects/expected.json b/tests/packagedcode/data/bower/author-objects/expected.json index 4f43c2c181..62b795fab1 100644 --- a/tests/packagedcode/data/bower/author-objects/expected.json +++ b/tests/packagedcode/data/bower/author-objects/expected.json @@ -51,7 +51,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -73,7 +73,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -95,7 +95,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/bower/basic/expected.json b/tests/packagedcode/data/bower/basic/expected.json index 417dbcd5fc..d22cf42bde 100644 --- a/tests/packagedcode/data/bower/basic/expected.json +++ b/tests/packagedcode/data/bower/basic/expected.json @@ -44,7 +44,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/bower/list-of-licenses/expected.json b/tests/packagedcode/data/bower/list-of-licenses/expected.json index 3c7f7616bc..dea4fdb08e 100644 --- a/tests/packagedcode/data/bower/list-of-licenses/expected.json +++ b/tests/packagedcode/data/bower/list-of-licenses/expected.json @@ -44,7 +44,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -66,7 +66,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -88,7 +88,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/bower/scan-expected.json b/tests/packagedcode/data/bower/scan-expected.json index 7fb78f634e..83d30f2fcd 100644 --- a/tests/packagedcode/data/bower/scan-expected.json +++ b/tests/packagedcode/data/bower/scan-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/bower.json", "start_line": 1, "end_line": 1, @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan/bower.json", "start_line": 1, "end_line": 1, @@ -96,7 +96,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "scan/bower.json", "start_line": 1, "end_line": 1, @@ -246,7 +246,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/bower.json", "start_line": 1, "end_line": 1, @@ -268,7 +268,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "scan/bower.json", "start_line": 1, "end_line": 1, @@ -290,7 +290,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "scan/bower.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/build/buck/end2end-expected.json b/tests/packagedcode/data/build/buck/end2end-expected.json index fbaf42f660..2034906b5e 100644 --- a/tests/packagedcode/data/build/buck/end2end-expected.json +++ b/tests/packagedcode/data/build/buck/end2end-expected.json @@ -81,7 +81,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cargo/cargo-with-workspace.expected.json b/tests/packagedcode/data/cargo/cargo-with-workspace.expected.json index e74a92222b..1a6f86ee54 100644 --- a/tests/packagedcode/data/cargo/cargo-with-workspace.expected.json +++ b/tests/packagedcode/data/cargo/cargo-with-workspace.expected.json @@ -44,7 +44,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/core/tauri/Cargo.toml", "start_line": 17, "end_line": 17, @@ -125,7 +125,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/core/tauri-runtime/Cargo.toml", "start_line": 17, "end_line": 17, @@ -206,7 +206,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/core/tauri-build/Cargo.toml", "start_line": 17, "end_line": 17, @@ -287,7 +287,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/core/tests/restart/Cargo.toml", "start_line": 17, "end_line": 17, @@ -365,7 +365,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/package.json", "start_line": 1, "end_line": 1, @@ -686,7 +686,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/Cargo.toml", "start_line": 17, "end_line": 17, @@ -740,7 +740,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/Cargo.toml", "start_line": 17, "end_line": 17, @@ -781,7 +781,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/Cargo.toml", "start_line": 17, "end_line": 17, @@ -817,7 +817,7 @@ "matches": [ { "license_expression": "cc0-1.0", - "spdx_license_expression": "CC0-1.0", + "license_expression_spdx": "CC0-1.0", "from_file": "cargo-with-workspace/LICENSE.spdx", "start_line": 2, "end_line": 2, @@ -838,7 +838,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "cargo-with-workspace/LICENSE.spdx", "start_line": 7, "end_line": 7, @@ -874,7 +874,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "cargo-with-workspace/LICENSE_APACHE-2.0", "start_line": 1, "end_line": 1, @@ -910,7 +910,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "cargo-with-workspace/LICENSE_MIT", "start_line": 1, "end_line": 1, @@ -946,7 +946,7 @@ "matches": [ { "license_expression": "mit OR (mit OR apache-2.0)", - "spdx_license_expression": "MIT OR (MIT OR Apache-2.0)", + "license_expression_spdx": "MIT OR (MIT OR Apache-2.0)", "from_file": "cargo-with-workspace/README.md", "start_line": 19, "end_line": 19, @@ -960,7 +960,7 @@ }, { "license_expression": "cc-by-nc-nd-4.0", - "spdx_license_expression": "CC-BY-NC-ND-4.0", + "license_expression_spdx": "CC-BY-NC-ND-4.0", "from_file": "cargo-with-workspace/README.md", "start_line": 21, "end_line": 21, @@ -1070,7 +1070,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/Cargo.toml", "start_line": 17, "end_line": 17, @@ -1177,7 +1177,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/Cargo.toml", "start_line": 17, "end_line": 17, @@ -1270,7 +1270,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/Cargo.toml", "start_line": 17, "end_line": 17, @@ -1391,7 +1391,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/Cargo.toml", "start_line": 17, "end_line": 17, @@ -1438,7 +1438,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/core/tests/restart/Cargo.toml", "start_line": 5, "end_line": 5, @@ -1789,7 +1789,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/examples/api/src-tauri/Cargo.toml", "start_line": 1, "end_line": 1, @@ -1836,7 +1836,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/examples/api/src-tauri/Cargo.toml", "start_line": 7, "end_line": 7, @@ -1901,7 +1901,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/package.json", "start_line": 1, "end_line": 1, @@ -1993,7 +1993,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "cargo-with-workspace/package.json", "start_line": 4, "end_line": 4, diff --git a/tests/packagedcode/data/cargo/cargo-with-workspace/boring.expected.json b/tests/packagedcode/data/cargo/cargo-with-workspace/boring.expected.json index 2c06b50d2b..da9c2aa033 100644 --- a/tests/packagedcode/data/cargo/cargo-with-workspace/boring.expected.json +++ b/tests/packagedcode/data/cargo/cargo-with-workspace/boring.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "boring/boring/Cargo.toml", "start_line": 1, "end_line": 1, @@ -117,7 +117,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "boring/boring-sys/Cargo.toml", "start_line": 1, "end_line": 1, @@ -191,7 +191,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "boring/tokio-boring/Cargo.toml", "start_line": 1, "end_line": 1, @@ -265,7 +265,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "boring/hyper-boring/Cargo.toml", "start_line": 1, "end_line": 1, @@ -980,7 +980,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "boring/boring-sys/Cargo.toml", "start_line": 1, "end_line": 1, @@ -1112,7 +1112,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "boring/boring/Cargo.toml", "start_line": 1, "end_line": 1, @@ -1277,7 +1277,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "boring/hyper-boring/Cargo.toml", "start_line": 1, "end_line": 1, @@ -1524,7 +1524,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "boring/tokio-boring/Cargo.toml", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json b/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json index 4b479a4dc1..12aa1bf215 100644 --- a/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json +++ b/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json @@ -44,7 +44,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -129,7 +129,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -214,7 +214,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -296,7 +296,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "tauri/core/tests/restart/Cargo.toml", "start_line": 1, "end_line": 1, @@ -377,7 +377,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "tauri/package.json", "start_line": 1, "end_line": 1, @@ -2769,7 +2769,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "tauri/core/tests/restart/Cargo.toml", "start_line": 1, "end_line": 1, @@ -3143,7 +3143,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "tauri/examples/api/src-tauri/Cargo.toml", "start_line": 1, "end_line": 1, @@ -3348,7 +3348,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "tauri/package.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cargo/cargo_toml/boring-child/Cargo.toml.expected b/tests/packagedcode/data/cargo/cargo_toml/boring-child/Cargo.toml.expected index b91aff6919..272e43f6a4 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/boring-child/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/boring-child/Cargo.toml.expected @@ -57,7 +57,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected b/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected index 69d91647cb..79b0a84c7c 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/clap/Cargo.toml.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cargo/cargo_toml/clippy/Cargo.toml.expected b/tests/packagedcode/data/cargo/cargo_toml/clippy/Cargo.toml.expected index 9066eac291..e2566ada19 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/clippy/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/clippy/Cargo.toml.expected @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cargo/cargo_toml/mdbook/Cargo.toml.expected b/tests/packagedcode/data/cargo/cargo_toml/mdbook/Cargo.toml.expected index dcd3df9514..f9489676f8 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/mdbook/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/mdbook/Cargo.toml.expected @@ -59,7 +59,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cargo/cargo_toml/rustfmt/Cargo.toml.expected b/tests/packagedcode/data/cargo/cargo_toml/rustfmt/Cargo.toml.expected index c4fd561ae1..6b0af2acde 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/rustfmt/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/rustfmt/Cargo.toml.expected @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected b/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected index 561edba914..6a60afc881 100644 --- a/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected +++ b/tests/packagedcode/data/cargo/cargo_toml/rustup/Cargo.toml.expected @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cargo/scan.expected.json b/tests/packagedcode/data/cargo/scan.expected.json index 3d27914d48..480b60afef 100644 --- a/tests/packagedcode/data/cargo/scan.expected.json +++ b/tests/packagedcode/data/cargo/scan.expected.json @@ -44,7 +44,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "scan/Cargo.toml", "start_line": 1, "end_line": 1, @@ -142,7 +142,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "scan/dac/Cargo.toml", "start_line": 1, "end_line": 1, @@ -1187,7 +1187,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "scan/Cargo.toml", "start_line": 1, "end_line": 1, @@ -1554,7 +1554,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "scan/dac/Cargo.toml", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/chef/basic/metadata.json.expected b/tests/packagedcode/data/chef/basic/metadata.json.expected index 3fc42b23e7..d46c395488 100644 --- a/tests/packagedcode/data/chef/basic/metadata.json.expected +++ b/tests/packagedcode/data/chef/basic/metadata.json.expected @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/chef/basic/metadata.rb.expected b/tests/packagedcode/data/chef/basic/metadata.rb.expected index eea7960dcb..1191a8f5a4 100644 --- a/tests/packagedcode/data/chef/basic/metadata.rb.expected +++ b/tests/packagedcode/data/chef/basic/metadata.rb.expected @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/chef/basic/test_package.json.expected b/tests/packagedcode/data/chef/basic/test_package.json.expected index 8ec0ee08d9..f7ff257ea0 100644 --- a/tests/packagedcode/data/chef/basic/test_package.json.expected +++ b/tests/packagedcode/data/chef/basic/test_package.json.expected @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/chef/basic/test_package_code_view_url_and_bug_tracking_url.json.expected b/tests/packagedcode/data/chef/basic/test_package_code_view_url_and_bug_tracking_url.json.expected index 1a52038bf1..9e8f06ce68 100644 --- a/tests/packagedcode/data/chef/basic/test_package_code_view_url_and_bug_tracking_url.json.expected +++ b/tests/packagedcode/data/chef/basic/test_package_code_view_url_and_bug_tracking_url.json.expected @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/chef/basic/test_package_dependencies.json.expected b/tests/packagedcode/data/chef/basic/test_package_dependencies.json.expected index d909710a68..ca1ef39b5e 100644 --- a/tests/packagedcode/data/chef/basic/test_package_dependencies.json.expected +++ b/tests/packagedcode/data/chef/basic/test_package_dependencies.json.expected @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/chef/basic/test_package_parties.json.expected b/tests/packagedcode/data/chef/basic/test_package_parties.json.expected index 8eb79e1954..83e6028618 100644 --- a/tests/packagedcode/data/chef/basic/test_package_parties.json.expected +++ b/tests/packagedcode/data/chef/basic/test_package_parties.json.expected @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/chef/dependencies/metadata.rb.expected b/tests/packagedcode/data/chef/dependencies/metadata.rb.expected index 82316a5d8e..5763166075 100644 --- a/tests/packagedcode/data/chef/dependencies/metadata.rb.expected +++ b/tests/packagedcode/data/chef/dependencies/metadata.rb.expected @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/chef/package.scan.expected.json b/tests/packagedcode/data/chef/package.scan.expected.json index 74e8d8cef9..67743f0dd7 100644 --- a/tests/packagedcode/data/chef/package.scan.expected.json +++ b/tests/packagedcode/data/chef/package.scan.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/metadata.rb", "start_line": 1, "end_line": 1, @@ -63,7 +63,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/metadata.json", "start_line": 1, "end_line": 1, @@ -189,7 +189,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/metadata.json", "start_line": 1, "end_line": 1, @@ -286,7 +286,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/metadata.rb", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json index 8280a06181..1e2baadaa6 100644 --- a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec", "start_line": 1, "end_line": 1, @@ -120,7 +120,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/Amplify.podspec", "start_line": 1, "end_line": 1, @@ -199,7 +199,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AmplifyPlugins.podspec", "start_line": 1, "end_line": 1, @@ -278,7 +278,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AmplifyTestCommon.podspec", "start_line": 1, "end_line": 1, @@ -357,7 +357,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AWSPluginsCore.podspec", "start_line": 1, "end_line": 1, @@ -436,7 +436,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AWSPredictionsPlugin.podspec", "start_line": 1, "end_line": 1, @@ -1046,7 +1046,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AWSPluginsCore.podspec", "start_line": 1, "end_line": 1, @@ -1131,7 +1131,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AWSPredictionsPlugin.podspec", "start_line": 1, "end_line": 1, @@ -1216,7 +1216,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/Amplify.podspec", "start_line": 1, "end_line": 1, @@ -1301,7 +1301,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AmplifyPlugins.podspec", "start_line": 1, "end_line": 1, @@ -1386,7 +1386,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AmplifyTestCommon.podspec", "start_line": 1, "end_line": 1, @@ -1471,7 +1471,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-with-license-expected.json b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-with-license-expected.json index 7fd0e4766b..79ac169643 100644 --- a/tests/packagedcode/data/cocoapods/assemble/many-podspecs-with-license-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/many-podspecs-with-license-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec", "start_line": 1, "end_line": 1, @@ -120,7 +120,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/Amplify.podspec", "start_line": 1, "end_line": 1, @@ -199,7 +199,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AmplifyPlugins.podspec", "start_line": 1, "end_line": 1, @@ -278,7 +278,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AmplifyTestCommon.podspec", "start_line": 1, "end_line": 1, @@ -357,7 +357,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AWSPluginsCore.podspec", "start_line": 1, "end_line": 1, @@ -436,7 +436,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AWSPredictionsPlugin.podspec", "start_line": 1, "end_line": 1, @@ -1119,7 +1119,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AWSPluginsCore.podspec", "start_line": 1, "end_line": 1, @@ -1166,7 +1166,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AWSPluginsCore.podspec", "start_line": 25, "end_line": 25, @@ -1231,7 +1231,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AWSPredictionsPlugin.podspec", "start_line": 1, "end_line": 1, @@ -1278,7 +1278,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AWSPredictionsPlugin.podspec", "start_line": 17, "end_line": 17, @@ -1343,7 +1343,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/Amplify.podspec", "start_line": 1, "end_line": 1, @@ -1390,7 +1390,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/Amplify.podspec", "start_line": 21, "end_line": 21, @@ -1455,7 +1455,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AmplifyPlugins.podspec", "start_line": 1, "end_line": 1, @@ -1502,7 +1502,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AmplifyPlugins.podspec", "start_line": 24, "end_line": 24, @@ -1567,7 +1567,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AmplifyTestCommon.podspec", "start_line": 1, "end_line": 1, @@ -1614,7 +1614,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/AmplifyTestCommon.podspec", "start_line": 24, "end_line": 24, @@ -1679,7 +1679,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec", "start_line": 1, "end_line": 1, @@ -1726,7 +1726,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/CoreMLPredictionsPlugin.podspec", "start_line": 14, "end_line": 14, @@ -1783,7 +1783,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/amplify-ios.LICENSE", "start_line": 2, "end_line": 175, @@ -1864,7 +1864,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/amplify-ios.LICENSE", "start_line": 2, "end_line": 175, @@ -2410,7 +2410,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "many-podspecs/amplify-ios.LICENSE", "start_line": 2, "end_line": 175, diff --git a/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json index 43d0b1a3dc..47a2cd107b 100644 --- a/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/multiple-podspec-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "multiple-podspec/RxDataSources.podspec", "start_line": 1, "end_line": 1, @@ -120,7 +120,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "multiple-podspec/Differentiator.podspec", "start_line": 1, "end_line": 1, @@ -401,7 +401,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "multiple-podspec/Differentiator.podspec", "start_line": 1, "end_line": 1, @@ -773,7 +773,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "multiple-podspec/RxDataSources.podspec", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json index 4162c8f82c..3771432607 100644 --- a/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/single-podspec-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "single-podspec/RxDataSources.podspec", "start_line": 1, "end_line": 1, @@ -609,7 +609,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "single-podspec/RxDataSources.podspec", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json b/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json index de12f96975..1048c706d2 100644 --- a/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json +++ b/tests/packagedcode/data/cocoapods/assemble/solo/RxDataSources.podspec-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "RxDataSources.podspec", "start_line": 1, "end_line": 1, @@ -127,7 +127,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "RxDataSources.podspec", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/podspec.json/FirebaseAnalytics.podspec.json.expected.json b/tests/packagedcode/data/cocoapods/podspec.json/FirebaseAnalytics.podspec.json.expected.json index dcefa1feb3..58b3c16a2f 100644 --- a/tests/packagedcode/data/cocoapods/podspec.json/FirebaseAnalytics.podspec.json.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec.json/FirebaseAnalytics.podspec.json.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json index 93e4c89aba..282ffc0499 100644 --- a/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/BadgeHub.podspec.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json index 1cf8cdad4b..abcb00afd5 100644 --- a/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/LoadingShimmer.podspec.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json index 258ff6b5ac..8afad9896a 100644 --- a/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/PayTabsSDK.podspec.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json index 32eb600003..2c1bf3a1c1 100644 --- a/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/RxDataSources.podspec.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json index d91bc3ac8e..c0c09b97a8 100644 --- a/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/Starscream.podspec.expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json index 4023ef7b53..d89c90bc6d 100644 --- a/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/SwiftLib.podspec.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/podspec/flutter_paytabs_bridge.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/flutter_paytabs_bridge.podspec.expected.json index 2a6a1b7809..f993ec2815 100644 --- a/tests/packagedcode/data/cocoapods/podspec/flutter_paytabs_bridge.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/flutter_paytabs_bridge.podspec.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json index 5040b3e36a..f3fa23f833 100644 --- a/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/kmmWebSocket.podspec.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json b/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json index 8e21c80371..5869b84e14 100644 --- a/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json +++ b/tests/packagedcode/data/cocoapods/podspec/nanopb.podspec.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/conan/recipes/boost/conan-boost-package-expected.json b/tests/packagedcode/data/conan/recipes/boost/conan-boost-package-expected.json index 143722a383..c828c8d5a4 100644 --- a/tests/packagedcode/data/conan/recipes/boost/conan-boost-package-expected.json +++ b/tests/packagedcode/data/conan/recipes/boost/conan-boost-package-expected.json @@ -36,7 +36,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -112,7 +112,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -188,7 +188,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -264,7 +264,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -340,7 +340,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -416,7 +416,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -492,7 +492,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -568,7 +568,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -644,7 +644,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -720,7 +720,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -796,7 +796,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -872,7 +872,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -948,7 +948,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -1024,7 +1024,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -1100,7 +1100,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conanfile.py", "start_line": 1, "end_line": 1, @@ -1926,7 +1926,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "manifest/conanfile.py", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/conan/recipes/boost/conanfile.py-expected.json b/tests/packagedcode/data/conan/recipes/boost/conanfile.py-expected.json index 328665a5c5..d16f8ce0d1 100644 --- a/tests/packagedcode/data/conan/recipes/boost/conanfile.py-expected.json +++ b/tests/packagedcode/data/conan/recipes/boost/conanfile.py-expected.json @@ -35,7 +35,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/conan/recipes/libgettext/conan-libgettext-package-expected.json b/tests/packagedcode/data/conan/recipes/libgettext/conan-libgettext-package-expected.json index 2390dec7f8..a6bfc76697 100644 --- a/tests/packagedcode/data/conan/recipes/libgettext/conan-libgettext-package-expected.json +++ b/tests/packagedcode/data/conan/recipes/libgettext/conan-libgettext-package-expected.json @@ -38,7 +38,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -116,7 +116,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -194,7 +194,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -272,7 +272,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "manifest/conanfile.py", "start_line": 1, "end_line": 1, @@ -515,7 +515,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "manifest/conanfile.py", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/conan/recipes/libgettext/conanfile.py-expected.json b/tests/packagedcode/data/conan/recipes/libgettext/conanfile.py-expected.json index ca68dac32c..a6613c9011 100644 --- a/tests/packagedcode/data/conan/recipes/libgettext/conanfile.py-expected.json +++ b/tests/packagedcode/data/conan/recipes/libgettext/conanfile.py-expected.json @@ -37,7 +37,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/conan/recipes/libzip/conan-libzip-package-expected.json b/tests/packagedcode/data/conan/recipes/libzip/conan-libzip-package-expected.json index 58fdab5571..7fc5173557 100644 --- a/tests/packagedcode/data/conan/recipes/libzip/conan-libzip-package-expected.json +++ b/tests/packagedcode/data/conan/recipes/libzip/conan-libzip-package-expected.json @@ -37,7 +37,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -114,7 +114,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -191,7 +191,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -268,7 +268,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "manifest/conandata.yml", "start_line": 1, "end_line": 1, @@ -345,7 +345,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "manifest/conanfile.py", "start_line": 1, "end_line": 1, @@ -707,7 +707,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "manifest/conanfile.py", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/conan/recipes/libzip/conanfile.py-expected.json b/tests/packagedcode/data/conan/recipes/libzip/conanfile.py-expected.json index 46fcdb357e..43b9aa5c45 100644 --- a/tests/packagedcode/data/conan/recipes/libzip/conanfile.py-expected.json +++ b/tests/packagedcode/data/conan/recipes/libzip/conanfile.py-expected.json @@ -36,7 +36,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/conda/meta.yaml.expected.json b/tests/packagedcode/data/conda/meta.yaml.expected.json index 91eb7b7edd..3a85a0e3f4 100644 --- a/tests/packagedcode/data/conda/meta.yaml.expected.json +++ b/tests/packagedcode/data/conda/meta.yaml.expected.json @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cran/codetools/package.json.expected b/tests/packagedcode/data/cran/codetools/package.json.expected index 1ed5834b6f..7852c7e527 100644 --- a/tests/packagedcode/data/cran/codetools/package.json.expected +++ b/tests/packagedcode/data/cran/codetools/package.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/cran/geometry/package.json.expected b/tests/packagedcode/data/cran/geometry/package.json.expected index ce3688156f..3283393779 100644 --- a/tests/packagedcode/data/cran/geometry/package.json.expected +++ b/tests/packagedcode/data/cran/geometry/package.json.expected @@ -89,7 +89,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/debian/basic-rootfs-expected.json b/tests/packagedcode/data/debian/basic-rootfs-expected.json index 137e3ae0c4..4dac440211 100644 --- a/tests/packagedcode/data/debian/basic-rootfs-expected.json +++ b/tests/packagedcode/data/debian/basic-rootfs-expected.json @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "x11-fsf", - "spdx_license_expression": "X11-distribute-modifications-variant", + "license_expression_spdx": "X11-distribute-modifications-variant", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 23, "end_line": 45, @@ -67,7 +67,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 50, "end_line": 70, @@ -89,7 +89,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 76, "end_line": 98, @@ -111,7 +111,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 105, "end_line": 127, @@ -243,7 +243,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 13, "end_line": 13, @@ -258,7 +258,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 14, "end_line": 26, @@ -273,7 +273,7 @@ }, { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 24, "end_line": 30, @@ -411,7 +411,7 @@ "matches": [ { "license_expression": "x11-fsf", - "spdx_license_expression": "X11-distribute-modifications-variant", + "license_expression_spdx": "X11-distribute-modifications-variant", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 23, "end_line": 45, @@ -433,7 +433,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 50, "end_line": 70, @@ -455,7 +455,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 76, "end_line": 98, @@ -477,7 +477,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 105, "end_line": 127, @@ -564,7 +564,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 13, "end_line": 13, @@ -579,7 +579,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 14, "end_line": 26, @@ -594,7 +594,7 @@ }, { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 24, "end_line": 30, diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/acme-tiny/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/acme-tiny/stable_copyright-detailed.expected.yml index 4a152b05c8..2b59521725 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/acme-tiny/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/acme-tiny/stable_copyright-detailed.expected.yml @@ -12,7 +12,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 16 end_line: 33 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/apache2/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/apache2/stable_copyright-detailed.expected.yml index 10b537aee9..f2ffb45069 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/apache2/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/apache2/stable_copyright-detailed.expected.yml @@ -48,7 +48,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 71 end_line: 71 @@ -61,7 +61,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 72 end_line: 88 @@ -95,7 +95,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-zeusbench matches: - license_expression: zeusbench - spdx_license_expression: LicenseRef-scancode-zeusbench + license_expression_spdx: LicenseRef-scancode-zeusbench from_file: start_line: 94 end_line: 103 @@ -122,7 +122,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 118 end_line: 142 @@ -164,7 +164,7 @@ other_license_detections: license_expression_spdx: HPND-sell-variant AND metamail matches: - license_expression: x11-keith-packard - spdx_license_expression: HPND-sell-variant + license_expression_spdx: HPND-sell-variant from_file: start_line: 172 end_line: '191' @@ -197,7 +197,7 @@ other_license_detections: OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - license_expression: metamail - spdx_license_expression: metamail + license_expression_spdx: metamail from_file: start_line: '197' end_line: 206 @@ -224,7 +224,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 209 end_line: 209 @@ -237,7 +237,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 210 end_line: 222 @@ -267,7 +267,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 224 end_line: 224 @@ -280,7 +280,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 225 end_line: 237 @@ -310,7 +310,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 240 end_line: 272 @@ -360,7 +360,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause-Darwin matches: - license_expression: bsd-simplified-darwin - spdx_license_expression: BSD-2-Clause-Darwin + license_expression_spdx: BSD-2-Clause-Darwin from_file: start_line: 279 end_line: 302 @@ -401,7 +401,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 AND Spencer-94 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 306 end_line: 309 @@ -418,7 +418,7 @@ other_license_detections: acknowledge Cisco Systems as the original contributor of this module. All other licensing and usage conditions are those of the Apache Software Foundation. - license_expression: hs-regexp - spdx_license_expression: Spencer-94 + license_expression_spdx: Spencer-94 from_file: start_line: 317 end_line: 335 @@ -454,7 +454,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-bsd-unchanged matches: - license_expression: bsd-unchanged - spdx_license_expression: LicenseRef-scancode-bsd-unchanged + license_expression_spdx: LicenseRef-scancode-bsd-unchanged from_file: start_line: 370 end_line: 391 @@ -493,7 +493,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 395 end_line: 419 @@ -535,7 +535,7 @@ other_license_detections: license_expression_spdx: Bison-exception-2.2 matches: - license_expression: bison-exception-2.2 - spdx_license_expression: Bison-exception-2.2 + license_expression_spdx: Bison-exception-2.2 from_file: start_line: 422 end_line: 433 @@ -564,7 +564,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 439 end_line: 454 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/appstream/appstream_0.12.5-1_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/appstream/appstream_0.12.5-1_copyright-detailed.expected.yml index 26aedb9452..b2b287b723 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/appstream/appstream_0.12.5-1_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/appstream/appstream_0.12.5-1_copyright-detailed.expected.yml @@ -34,7 +34,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 67 end_line: 67 @@ -47,7 +47,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 68 end_line: 82 @@ -79,7 +79,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 84 end_line: 84 @@ -92,7 +92,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 85 end_line: 96 @@ -117,7 +117,7 @@ other_license_detections: You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 98 end_line: 99 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/asterisk/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/asterisk/stable_copyright-detailed.expected.yml index c667351a48..0744125cad 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/asterisk/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/asterisk/stable_copyright-detailed.expected.yml @@ -84,7 +84,7 @@ other_license_detections: license_expression_spdx: Autoconf-exception-generic matches: - license_expression: autoconf-simple-exception-2.0 - spdx_license_expression: Autoconf-exception-generic + license_expression_spdx: Autoconf-exception-generic from_file: start_line: 109 end_line: 112 @@ -105,7 +105,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 242 end_line: 243 @@ -124,7 +124,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer matches: - license_expression: public-domain-disclaimer - spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 296 end_line: 297 @@ -143,7 +143,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 314 end_line: 314 @@ -160,7 +160,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 333 end_line: 334 @@ -179,7 +179,7 @@ other_license_detections: license_expression_spdx: Bison-exception-2.2 matches: - license_expression: bison-exception-2.2 - spdx_license_expression: Bison-exception-2.2 + license_expression_spdx: Bison-exception-2.2 from_file: start_line: 361 end_line: 369 @@ -205,7 +205,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 407 end_line: 408 @@ -224,7 +224,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 464 end_line: 509 @@ -287,7 +287,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 521 end_line: 530 @@ -314,7 +314,7 @@ other_license_detections: license_expression_spdx: MIT-0 matches: - license_expression: mit-0 - spdx_license_expression: MIT-0 + license_expression_spdx: MIT-0 from_file: start_line: 533 end_line: 547 @@ -346,7 +346,7 @@ other_license_detections: license_expression_spdx: NTP matches: - license_expression: mit-old-style-no-advert - spdx_license_expression: NTP + license_expression_spdx: NTP from_file: start_line: 550 end_line: 558 @@ -372,7 +372,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 561 end_line: 583 @@ -412,7 +412,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 586 end_line: 608 @@ -452,7 +452,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 611 end_line: 635 @@ -494,7 +494,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 638 end_line: 665 @@ -539,7 +539,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause matches: - license_expression: bsd-original - spdx_license_expression: BSD-4-Clause + license_expression_spdx: BSD-4-Clause from_file: start_line: 668 end_line: 696 @@ -585,7 +585,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-brian-clapper matches: - license_expression: brian-clapper - spdx_license_expression: LicenseRef-scancode-brian-clapper + license_expression_spdx: LicenseRef-scancode-brian-clapper from_file: start_line: 699 end_line: 719 @@ -623,7 +623,7 @@ other_license_detections: license_expression_spdx: TU-Berlin-1.0 matches: - license_expression: tu-berlin - spdx_license_expression: TU-Berlin-1.0 + license_expression_spdx: TU-Berlin-1.0 from_file: start_line: 722 end_line: 731 @@ -650,7 +650,7 @@ other_license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 734 end_line: 736 @@ -670,7 +670,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-wol matches: - license_expression: wol - spdx_license_expression: LicenseRef-scancode-wol + license_expression_spdx: LicenseRef-scancode-wol from_file: start_line: 739 end_line: 745 @@ -694,7 +694,7 @@ other_license_detections: license_expression_spdx: FSFUL matches: - license_expression: fsf-free - spdx_license_expression: FSFUL + license_expression_spdx: FSFUL from_file: start_line: 749 end_line: 750 @@ -713,7 +713,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 94 end_line: 94 @@ -730,7 +730,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 89 end_line: 91 @@ -750,7 +750,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 104 end_line: 107 @@ -771,7 +771,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 145 end_line: 145 @@ -788,7 +788,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 141 end_line: 142 @@ -807,7 +807,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 168 end_line: 168 @@ -824,7 +824,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 165 end_line: 165 @@ -841,7 +841,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unknown matches: - license_expression: unknown - spdx_license_expression: LicenseRef-scancode-unknown + license_expression_spdx: LicenseRef-scancode-unknown from_file: start_line: 178 end_line: 178 @@ -858,7 +858,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-free-unknown matches: - license_expression: free-unknown - spdx_license_expression: LicenseRef-scancode-free-unknown + license_expression_spdx: LicenseRef-scancode-free-unknown from_file: start_line: '194' end_line: '197' @@ -879,7 +879,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unknown matches: - license_expression: unknown - spdx_license_expression: LicenseRef-scancode-unknown + license_expression_spdx: LicenseRef-scancode-unknown from_file: start_line: 247 end_line: 247 @@ -896,7 +896,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 249 end_line: 267 @@ -932,7 +932,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 277 end_line: 284 @@ -957,7 +957,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 324 end_line: 327 @@ -978,7 +978,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 341 end_line: 343 @@ -998,7 +998,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 356 end_line: 359 @@ -1019,7 +1019,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 381 end_line: 381 @@ -1036,7 +1036,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 378 end_line: 378 @@ -1053,7 +1053,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 387 end_line: 389 @@ -1073,7 +1073,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 402 end_line: 402 @@ -1090,7 +1090,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only OR LGPL-2.0-or-later matches: - license_expression: gpl-2.0 OR lgpl-2.0-plus - spdx_license_expression: GPL-2.0-only OR LGPL-2.0-or-later + license_expression_spdx: GPL-2.0-only OR LGPL-2.0-or-later from_file: start_line: 395 end_line: 399 @@ -1112,7 +1112,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 430 end_line: 430 @@ -1129,7 +1129,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 426 end_line: 427 @@ -1148,7 +1148,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 435 end_line: 436 @@ -1167,7 +1167,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 461 end_line: 461 @@ -1184,7 +1184,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 458 end_line: 458 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/b/backup-manager/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/b/backup-manager/stable_copyright-detailed.expected.yml index b96c4d4f18..b56acbff79 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/b/backup-manager/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/b/backup-manager/stable_copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 20 end_line: 26 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamav/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamav/stable_copyright-detailed.expected.yml index 6be47e8048..137798f77d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamav/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamav/stable_copyright-detailed.expected.yml @@ -74,7 +74,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 24 end_line: 24 @@ -87,7 +87,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 25 end_line: 32 @@ -112,7 +112,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only AND cryptsetup-OpenSSL-exception matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 50 end_line: 57 @@ -133,7 +133,7 @@ other_license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - license_expression: openssl-exception-gpl-3.0-plus - spdx_license_expression: cryptsetup-OpenSSL-exception + license_expression_spdx: cryptsetup-OpenSSL-exception from_file: start_line: 59 end_line: 71 @@ -159,7 +159,7 @@ other_license_detections: version. If you delete this exception statement from all source files in the program, then also delete it here. - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 73 end_line: 79 @@ -183,7 +183,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND Autoconf-exception-generic AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 155 end_line: 163 @@ -205,7 +205,7 @@ other_license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - license_expression: autoconf-simple-exception-2.0 - spdx_license_expression: Autoconf-exception-generic + license_expression_spdx: Autoconf-exception-generic from_file: start_line: 165 end_line: 168 @@ -222,7 +222,7 @@ other_license_detections: configuration script generated by Autoconf, you may include it under the same distribution terms that you use for the rest of that program. - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 170 end_line: 176 @@ -246,7 +246,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-only matches: - license_expression: gpl-3.0-plus WITH autoconf-simple-exception - spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 + license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 from_file: start_line: 186 end_line: 201 @@ -275,7 +275,7 @@ other_license_detections: program. This Exception is an additional permission under section 7 of the GNU General Public License, version 3 ("GPLv3"). - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 203 end_line: 209 @@ -299,7 +299,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus WITH libtool-exception-2.0 - spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception + license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception from_file: start_line: 217 end_line: 230 @@ -326,7 +326,7 @@ other_license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 232 end_line: 238 @@ -350,7 +350,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later WITH Libtool-exception AND LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus WITH libtool-exception-2.0 - spdx_license_expression: LGPL-2.0-or-later WITH Libtool-exception + license_expression_spdx: LGPL-2.0-or-later WITH Libtool-exception from_file: start_line: 245 end_line: 258 @@ -377,7 +377,7 @@ other_license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 260 end_line: 266 @@ -401,7 +401,7 @@ other_license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 376 end_line: 386 @@ -429,7 +429,7 @@ other_license_detections: license_expression_spdx: FSFULLR matches: - license_expression: fsf-unlimited - spdx_license_expression: FSFULLR + license_expression_spdx: FSFULLR from_file: start_line: 407 end_line: 409 @@ -449,7 +449,7 @@ other_license_detections: license_expression_spdx: FSFUL matches: - license_expression: fsf-free - spdx_license_expression: FSFUL + license_expression_spdx: FSFUL from_file: start_line: 417 end_line: 418 @@ -468,7 +468,7 @@ other_license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 446 end_line: 453 @@ -493,7 +493,7 @@ other_license_detections: license_expression_spdx: FSFAP matches: - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 460 end_line: 463 @@ -514,7 +514,7 @@ other_license_detections: license_expression_spdx: FSFAP matches: - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 470 end_line: 473 @@ -535,7 +535,7 @@ other_license_detections: license_expression_spdx: bzip2-1.0.6 matches: - license_expression: bzip2-libbzip-2010 - spdx_license_expression: bzip2-1.0.6 + license_expression_spdx: bzip2-1.0.6 from_file: start_line: 482 end_line: 511 @@ -582,7 +582,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 518 end_line: 518 @@ -595,7 +595,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE matched_text: public domain - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 519 end_line: 519 @@ -612,7 +612,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 526 end_line: 526 @@ -629,7 +629,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 533 end_line: 533 @@ -646,7 +646,7 @@ other_license_detections: license_expression_spdx: libtiff matches: - license_expression: x11-tiff - spdx_license_expression: libtiff + license_expression_spdx: libtiff from_file: start_line: 543 end_line: 560 @@ -681,7 +681,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 565 end_line: 565 @@ -694,7 +694,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_38.RULE matched_text: is public domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 569 end_line: 569 @@ -711,7 +711,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 AND Apache-2.0 WITH LicenseRef-scancode-generic-exception matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 579 end_line: 589 @@ -735,7 +735,7 @@ other_license_detections: See the License for the specific language governing permissions and limitations under the License. - license_expression: apache-2.0 WITH generic-exception - spdx_license_expression: Apache-2.0 WITH LicenseRef-scancode-generic-exception + license_expression_spdx: Apache-2.0 WITH LicenseRef-scancode-generic-exception from_file: start_line: 591 end_line: 602 @@ -764,7 +764,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-3.0-only matches: - license_expression: gpl-3.0-plus WITH bison-exception-2.2 - spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2 + license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2 from_file: start_line: 610 end_line: 628 @@ -796,7 +796,7 @@ other_license_detections: Bison output files to be licensed under the GNU General Public License without this special exception. - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 630 end_line: 636 @@ -820,7 +820,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 638 end_line: 638 @@ -833,7 +833,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 639 end_line: 647 @@ -859,7 +859,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 649 end_line: 649 @@ -872,7 +872,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 650 end_line: 657 @@ -897,7 +897,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 668 end_line: 683 @@ -930,7 +930,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 686 end_line: 705 @@ -967,7 +967,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 708 end_line: 730 @@ -1007,7 +1007,7 @@ other_license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 733 end_line: 747 @@ -1039,7 +1039,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 34 end_line: 40 @@ -1063,7 +1063,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 73 end_line: 79 @@ -1087,7 +1087,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 121 end_line: 127 @@ -1111,7 +1111,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 135 end_line: 141 @@ -1135,7 +1135,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 170 end_line: 176 @@ -1159,7 +1159,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-only matches: - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 203 end_line: 209 @@ -1183,7 +1183,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 232 end_line: 238 @@ -1207,7 +1207,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 260 end_line: 266 @@ -1231,7 +1231,7 @@ other_license_detections: license_expression_spdx: X11 AND LicenseRef-scancode-public-domain matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: 293 end_line: 296 @@ -1248,7 +1248,7 @@ other_license_detections: ings in this Software without prior written authorization from the X Consor- tium. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 298 end_line: 298 @@ -1265,7 +1265,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 WITH LicenseRef-scancode-generic-exception matches: - license_expression: apache-2.0 WITH generic-exception - spdx_license_expression: Apache-2.0 WITH LicenseRef-scancode-generic-exception + license_expression_spdx: Apache-2.0 WITH LicenseRef-scancode-generic-exception from_file: start_line: 591 end_line: 602 @@ -1294,7 +1294,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-only matches: - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 630 end_line: 636 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamavmini/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamavmini/stable_copyright-detailed.expected.yml index 05d2f2e4d6..ec74016251 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamavmini/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/clamavmini/stable_copyright-detailed.expected.yml @@ -10,7 +10,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 24 end_line: 24 @@ -23,7 +23,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 25 end_line: 32 @@ -48,7 +48,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 34 end_line: 40 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/cryptsetup/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/cryptsetup/stable_copyright-detailed.expected.yml index 54cbf84e8e..69a198e50b 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/cryptsetup/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/cryptsetup/stable_copyright-detailed.expected.yml @@ -43,7 +43,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-gary-s-brown matches: - license_expression: gary-s-brown - spdx_license_expression: LicenseRef-scancode-gary-s-brown + license_expression_spdx: LicenseRef-scancode-gary-s-brown from_file: start_line: 81 end_line: 82 @@ -62,7 +62,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 84 end_line: 84 @@ -75,7 +75,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 85 end_line: 100 @@ -108,7 +108,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception matches: - license_expression: gpl-2.0-plus WITH openssl-exception-gpl-3.0-plus - spdx_license_expression: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception + license_expression_spdx: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception from_file: start_line: 103 end_line: 130 @@ -153,7 +153,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 132 end_line: 132 @@ -166,7 +166,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 133 end_line: 149 @@ -200,7 +200,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception matches: - license_expression: lgpl-2.1-plus WITH openssl-exception-gpl-3.0-plus - spdx_license_expression: LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception + license_expression_spdx: LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception from_file: start_line: 152 end_line: 180 @@ -246,7 +246,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 183 end_line: 187 @@ -268,7 +268,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 189 end_line: 189 @@ -281,7 +281,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: '190' end_line: 203 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/cups/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/cups/stable_copyright-detailed.expected.yml index 9c221265ee..3b52ab3b62 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/cups/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/c/cups/stable_copyright-detailed.expected.yml @@ -17,7 +17,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 26 end_line: 48 @@ -57,7 +57,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-cups matches: - license_expression: cups - spdx_license_expression: LicenseRef-scancode-cups + license_expression_spdx: LicenseRef-scancode-cups from_file: start_line: 51 end_line: 107 @@ -131,7 +131,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-cups matches: - license_expression: cups - spdx_license_expression: LicenseRef-scancode-cups + license_expression_spdx: LicenseRef-scancode-cups from_file: start_line: 110 end_line: 166 @@ -205,7 +205,7 @@ other_license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 169 end_line: 169 @@ -218,7 +218,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/zlib_7.RULE matched_text: zlib License - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 171 end_line: 188 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dbconfig-common/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dbconfig-common/stable_copyright-detailed.expected.yml index 78595651cd..789ccd79c1 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dbconfig-common/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dbconfig-common/stable_copyright-detailed.expected.yml @@ -11,7 +11,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 10 end_line: 10 @@ -24,7 +24,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 11 end_line: 16 @@ -47,7 +47,7 @@ other_license_detections: license_expression_spdx: AFL-2.1 matches: - license_expression: afl-2.1 - spdx_license_expression: AFL-2.1 + license_expression_spdx: AFL-2.1 from_file: start_line: 21 end_line: 21 @@ -60,7 +60,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/afl-2.1_12.RULE matched_text: This document is licensed under the Academic Free License, Version 2.1 - license_expression: afl-2.1 - spdx_license_expression: AFL-2.1 + license_expression_spdx: AFL-2.1 from_file: start_line: 26 end_line: 181 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/devscripts/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/devscripts/stable_copyright-detailed.expected.yml index 988b2ba579..e2790b9779 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/devscripts/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/devscripts/stable_copyright-detailed.expected.yml @@ -162,7 +162,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl matches: - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 355 end_line: 355 @@ -175,7 +175,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE matched_text: 'License: artistic' - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 356 end_line: 360 @@ -197,7 +197,7 @@ other_license_detections: license_expression_spdx: Artistic-2.0 matches: - license_expression: artistic-2.0 - spdx_license_expression: Artistic-2.0 + license_expression_spdx: Artistic-2.0 from_file: start_line: 363 end_line: 551 @@ -403,7 +403,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later AND GPL-1.0-only matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 553 end_line: 553 @@ -416,7 +416,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_395.RULE matched_text: 'License: gpl-1+' - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 554 end_line: 557 @@ -433,7 +433,7 @@ other_license_detections: the Free Software Foundation; either version 1, or (at your option) any later version. - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 559 end_line: 560 @@ -448,7 +448,7 @@ other_license_detections: the GNU General Public License - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 560 end_line: 560 @@ -461,7 +461,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_424.RULE matched_text: usr/share/common-licenses/GPL- - license_expression: gpl-1.0 - spdx_license_expression: GPL-1.0-only + license_expression_spdx: GPL-1.0-only from_file: start_line: 560 end_line: 560 @@ -478,7 +478,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 562 end_line: 562 @@ -491,7 +491,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 563 end_line: 565 @@ -507,7 +507,7 @@ other_license_detections: it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2. - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 567 end_line: 568 @@ -526,7 +526,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 570 end_line: 570 @@ -539,7 +539,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 571 end_line: 574 @@ -556,7 +556,7 @@ other_license_detections: the Free Software Foundation; either version 2, or (at your option) any later version. - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 576 end_line: 577 @@ -575,7 +575,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-only AND GPL-1.0-or-later matches: - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 579 end_line: 579 @@ -588,7 +588,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_rdesc_1.RULE matched_text: 'License: gpl-3' - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 580 end_line: 582 @@ -604,7 +604,7 @@ other_license_detections: it under the terms of the GNU General Public License as published by the Free Software Foundation; - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 584 end_line: 585 @@ -619,7 +619,7 @@ other_license_detections: version 3 of the GNU General Public License - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 585 end_line: 585 @@ -636,7 +636,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-only matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 587 end_line: 587 @@ -649,7 +649,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 588 end_line: 591 @@ -666,7 +666,7 @@ other_license_detections: the Free Software Foundation; either version 3, or (at your option) any later version. - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 593 end_line: 594 @@ -681,7 +681,7 @@ other_license_detections: version 3 of the GNU General Public License - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 594 end_line: 594 @@ -698,7 +698,7 @@ other_license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 597 end_line: 607 @@ -726,7 +726,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer matches: - license_expression: public-domain-disclaimer - spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 610 end_line: 612 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dma/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dma/stable_copyright-detailed.expected.yml index 148d608e8a..9844d5b649 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dma/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dma/stable_copyright-detailed.expected.yml @@ -22,7 +22,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 47 end_line: 59 @@ -52,7 +52,7 @@ other_license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 62 end_line: 72 @@ -80,7 +80,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 75 end_line: 94 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dovecot/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dovecot/stable_copyright-detailed.expected.yml index 179982b24b..0bfcd65ff5 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dovecot/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dovecot/stable_copyright-detailed.expected.yml @@ -48,7 +48,7 @@ other_license_detections: license_expression_spdx: Beerware matches: - license_expression: beerware - spdx_license_expression: Beerware + license_expression_spdx: Beerware from_file: start_line: 32 end_line: 35 @@ -69,7 +69,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 46 end_line: 47 @@ -88,7 +88,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 121 end_line: 137 @@ -122,7 +122,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 139 end_line: 139 @@ -135,7 +135,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 140 end_line: 152 @@ -161,7 +161,7 @@ other_license_detections: License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 154 end_line: 154 @@ -174,7 +174,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_83_1.RULE matched_text: the GNU Lesser General Public License - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 155 end_line: 155 @@ -191,7 +191,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 157 end_line: 157 @@ -204,7 +204,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 158 end_line: 171 @@ -235,7 +235,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 176 end_line: '198' @@ -275,7 +275,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 201 end_line: 220 @@ -312,7 +312,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 222 end_line: 222 @@ -325,7 +325,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 223 end_line: 235 @@ -351,7 +351,7 @@ other_license_detections: with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 237 end_line: 237 @@ -364,7 +364,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_660.RULE matched_text: the GNU General Public License version 2 - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 238 end_line: 238 @@ -381,7 +381,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 241 end_line: 273 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dpdk/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dpdk/stable_copyright-detailed.expected.yml index c2ca76deed..c5ead17a00 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dpdk/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/d/dpdk/stable_copyright-detailed.expected.yml @@ -29,7 +29,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 66 end_line: 66 @@ -42,7 +42,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 67 end_line: 68 @@ -61,7 +61,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 71 end_line: 77 @@ -85,7 +85,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-only matches: - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 79 end_line: 79 @@ -98,7 +98,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_rdesc_1.RULE matched_text: 'License: gpl-3' - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 80 end_line: 81 @@ -117,7 +117,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 83 end_line: 83 @@ -130,7 +130,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 84 end_line: 85 @@ -149,7 +149,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 88 end_line: 111 @@ -190,7 +190,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 114 end_line: 138 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_copyright-detailed.expected.yml index 43de122800..881eeb6a0d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_copyright-detailed.expected.yml @@ -10,7 +10,7 @@ license_detections: license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP matches: - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert - spdx_license_expression: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP + license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP from_file: start_line: 17 end_line: 30 @@ -35,7 +35,7 @@ license_detections: license_expression_spdx: NTP-0 AND BSD-3-Clause matches: - license_expression: ntp-0 - spdx_license_expression: NTP-0 + license_expression_spdx: NTP-0 from_file: start_line: 38 end_line: 45 @@ -56,7 +56,7 @@ license_detections: this software for any purpose. It is provided "as is" without express or implied warranty. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 49 end_line: 73 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_e2fsck-static.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_e2fsck-static.copyright-detailed.expected.yml index c54cc29a11..e4ea07c618 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_e2fsck-static.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_e2fsck-static.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 18 end_line: '19' @@ -27,7 +27,7 @@ license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 24 end_line: 25 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_e2fsprogs-l10n.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_e2fsprogs-l10n.copyright-detailed.expected.yml index c54cc29a11..e4ea07c618 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_e2fsprogs-l10n.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_e2fsprogs-l10n.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 18 end_line: '19' @@ -27,7 +27,7 @@ license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 24 end_line: 25 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libblkid.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libblkid.copyright-detailed.expected.yml index a1710dca4b..43911f4662 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libblkid.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libblkid.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LGPL-2.0-only matches: - license_expression: lgpl-2.0 - spdx_license_expression: LGPL-2.0-only + license_expression_spdx: LGPL-2.0-only from_file: start_line: 15 end_line: '19' diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libcom-err2.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libcom-err2.copyright-detailed.expected.yml index cfba6a19b8..af97c02e9b 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libcom-err2.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libcom-err2.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: NTP matches: - license_expression: mit-old-style-no-advert - spdx_license_expression: NTP + license_expression_spdx: NTP from_file: start_line: 14 end_line: 24 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libss2.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libss2.copyright-detailed.expected.yml index 820a1963ad..cc0d6ef0e0 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libss2.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libss2.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: NTP matches: - license_expression: mit-old-style-no-advert - spdx_license_expression: NTP + license_expression_spdx: NTP from_file: start_line: 15 end_line: 25 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libuuid1.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libuuid1.copyright-detailed.expected.yml index 0abd2d898b..009dd92f77 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libuuid1.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_libuuid1.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 14 end_line: 38 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_uuid-dev.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_uuid-dev.copyright-detailed.expected.yml index 0abd2d898b..009dd92f77 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_uuid-dev.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_uuid-dev.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 14 end_line: 38 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_uuid-runtime.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_uuid-runtime.copyright-detailed.expected.yml index 04d88023fb..67ff2ab7b8 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_uuid-runtime.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/e2fsprogs/stable_uuid-runtime.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 15 end_line: 39 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/enigmail/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/enigmail/stable_copyright-detailed.expected.yml index a8a6bb1aab..81f3a8f4e0 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/enigmail/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/enigmail/stable_copyright-detailed.expected.yml @@ -21,7 +21,7 @@ other_license_detections: license_expression_spdx: MPL-2.0 matches: - license_expression: mpl-2.0 - spdx_license_expression: MPL-2.0 + license_expression_spdx: MPL-2.0 from_file: start_line: 38 end_line: 38 @@ -34,7 +34,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-2.0_75.RULE matched_text: 'License: mpl-2.0' - license_expression: mpl-2.0 - spdx_license_expression: MPL-2.0 + license_expression_spdx: MPL-2.0 from_file: start_line: 39 end_line: 411 @@ -424,7 +424,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause-Views matches: - license_expression: bsd-2-clause-views - spdx_license_expression: BSD-2-Clause-Views + license_expression_spdx: BSD-2-Clause-Views from_file: start_line: 414 end_line: 441 @@ -469,7 +469,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 446 end_line: 470 @@ -511,7 +511,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 472 end_line: 472 @@ -524,7 +524,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE matched_text: 'License: cc0-1.0' - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 473 end_line: 481 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/epiphany-browser/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/epiphany-browser/stable_copyright-detailed.expected.yml index 5f175197b9..bf7db6bdf1 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/epiphany-browser/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/epiphany-browser/stable_copyright-detailed.expected.yml @@ -37,7 +37,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 93 end_line: 93 @@ -50,7 +50,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 94 end_line: 107 @@ -81,7 +81,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 109 end_line: 109 @@ -94,7 +94,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 110 end_line: 124 @@ -126,7 +126,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 126 end_line: 126 @@ -139,7 +139,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 127 end_line: 141 @@ -171,7 +171,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 143 end_line: 143 @@ -184,7 +184,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 144 end_line: 155 @@ -213,7 +213,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 157 end_line: 157 @@ -226,7 +226,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE matched_text: 'License: cc0-1.0' - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 158 end_line: 179 @@ -265,7 +265,7 @@ other_license_detections: license_expression_spdx: CC-BY-SA-3.0 matches: - license_expression: cc-by-sa-3.0 - spdx_license_expression: CC-BY-SA-3.0 + license_expression_spdx: CC-BY-SA-3.0 from_file: start_line: 182 end_line: 488 @@ -589,7 +589,7 @@ other_license_detections: license_expression_spdx: CC-BY-SA-4.0 matches: - license_expression: cc-by-sa-4.0 - spdx_license_expression: CC-BY-SA-4.0 + license_expression_spdx: CC-BY-SA-4.0 from_file: start_line: 491 end_line: 491 @@ -602,7 +602,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc-by-sa-4.0_36.RULE matched_text: http://creativecommons.org/licenses/by-sa/4.0/ - license_expression: cc-by-sa-4.0 - spdx_license_expression: CC-BY-SA-4.0 + license_expression_spdx: CC-BY-SA-4.0 from_file: start_line: 493 end_line: 914 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/erlang-p1-pkix/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/erlang-p1-pkix/stable_copyright-detailed.expected.yml index 20862decf6..106790a5fd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/erlang-p1-pkix/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/e/erlang-p1-pkix/stable_copyright-detailed.expected.yml @@ -12,7 +12,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 14 end_line: 14 @@ -25,7 +25,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 15 end_line: 28 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fig2dev/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fig2dev/stable_copyright-detailed.expected.yml index 523f93cd2b..a14d098469 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fig2dev/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fig2dev/stable_copyright-detailed.expected.yml @@ -18,7 +18,7 @@ other_license_detections: license_expression_spdx: Xfig matches: - license_expression: mit-xfig - spdx_license_expression: Xfig + license_expression_spdx: Xfig from_file: start_line: 28 end_line: 35 @@ -43,7 +43,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 53 end_line: 53 @@ -56,7 +56,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0 OR gpl-3.0 - spdx_license_expression: GPL-2.0-only OR GPL-3.0-only + license_expression_spdx: GPL-2.0-only OR GPL-3.0-only from_file: start_line: 54 end_line: 69 @@ -89,7 +89,7 @@ other_license_detections: license_expression_spdx: NTP matches: - license_expression: mit-old-style-no-advert - spdx_license_expression: NTP + license_expression_spdx: NTP from_file: start_line: 75 end_line: 83 @@ -115,7 +115,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-only AND GPL-3.0-or-later matches: - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 88 end_line: 88 @@ -128,7 +128,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_rdesc_1.RULE matched_text: 'License: gpl-3' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 89 end_line: 97 @@ -150,7 +150,7 @@ other_license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 99 end_line: 101 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/freeorion/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/freeorion/stable_copyright-detailed.expected.yml index 8afc71498f..17f840c700 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/freeorion/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/freeorion/stable_copyright-detailed.expected.yml @@ -33,7 +33,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 69 end_line: 69 @@ -46,7 +46,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 70 end_line: 83 @@ -77,7 +77,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later AND LGPL-2.1-only matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 85 end_line: 85 @@ -90,7 +90,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 86 end_line: 94 @@ -112,7 +112,7 @@ other_license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 96 end_line: 96 @@ -125,7 +125,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_215.RULE matched_text: the GNU Library General Public License - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 97 end_line: 97 @@ -142,7 +142,7 @@ other_license_detections: license_expression_spdx: BSL-1.0 matches: - license_expression: boost-1.0 - spdx_license_expression: BSL-1.0 + license_expression_spdx: BSL-1.0 from_file: start_line: 100 end_line: 122 @@ -182,7 +182,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 125 end_line: 139 @@ -214,7 +214,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 141 end_line: 141 @@ -227,7 +227,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 142 end_line: 143 @@ -246,7 +246,7 @@ other_license_detections: license_expression_spdx: CC-BY-SA-3.0 matches: - license_expression: cc-by-sa-3.0 - spdx_license_expression: CC-BY-SA-3.0 + license_expression_spdx: CC-BY-SA-3.0 from_file: start_line: 146 end_line: 521 @@ -639,7 +639,7 @@ other_license_detections: license_expression_spdx: Bitstream-Vera matches: - license_expression: bitstream - spdx_license_expression: Bitstream-Vera + license_expression_spdx: Bitstream-Vera from_file: start_line: 524 end_line: 566 @@ -695,7 +695,7 @@ other_license_detections: Inc., respectively. For further information, contact: fonts at gnome dot org. - license_expression: bitstream - spdx_license_expression: Bitstream-Vera + license_expression_spdx: Bitstream-Vera from_file: start_line: 573 end_line: 614 @@ -754,7 +754,7 @@ other_license_detections: license_expression_spdx: CC-BY-SA-3.0 AND GPL-2.0-only matches: - license_expression: cc-by-sa-3.0 - spdx_license_expression: CC-BY-SA-3.0 + license_expression_spdx: CC-BY-SA-3.0 from_file: start_line: '19' end_line: 21 @@ -770,7 +770,7 @@ other_license_detections: Attribution-Share Alike 3.0 Unported license. (http://creativecommons.org/licenses/by-sa/3.0/) - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 26 end_line: 27 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fuse-emulator/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fuse-emulator/stable_copyright-detailed.expected.yml index 986f3f1eb7..2d72b7fffd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fuse-emulator/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fuse-emulator/stable_copyright-detailed.expected.yml @@ -20,7 +20,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 34 end_line: 34 @@ -33,7 +33,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 35 end_line: 45 @@ -61,7 +61,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 47 end_line: 47 @@ -74,7 +74,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 48 end_line: 58 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fusiondirectory/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fusiondirectory/stable_copyright-detailed.expected.yml index 0c3867df9b..2d9b86d30a 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fusiondirectory/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/f/fusiondirectory/stable_copyright-detailed.expected.yml @@ -74,7 +74,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 1523 end_line: 1523 @@ -87,7 +87,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 1524 end_line: 1539 @@ -120,7 +120,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1541 end_line: 1541 @@ -133,7 +133,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1542 end_line: 1557 @@ -166,7 +166,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 1559 end_line: 1559 @@ -179,7 +179,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 1560 end_line: 1577 @@ -214,7 +214,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 1580 end_line: 1596 @@ -248,7 +248,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1599 end_line: 1621 @@ -288,7 +288,7 @@ license_detections: license_expression_spdx: BSD-4-Clause matches: - license_expression: bsd-original - spdx_license_expression: BSD-4-Clause + license_expression_spdx: BSD-4-Clause from_file: start_line: 1624 end_line: 1649 @@ -331,7 +331,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 1651 end_line: 1651 @@ -344,7 +344,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 1652 end_line: 1663 @@ -373,7 +373,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 1666 end_line: 1669 @@ -394,7 +394,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-free-unknown matches: - license_expression: free-unknown - spdx_license_expression: LicenseRef-scancode-free-unknown + license_expression_spdx: LicenseRef-scancode-free-unknown from_file: start_line: 413 end_line: 413 @@ -411,7 +411,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-free-unknown matches: - license_expression: free-unknown - spdx_license_expression: LicenseRef-scancode-free-unknown + license_expression_spdx: LicenseRef-scancode-free-unknown from_file: start_line: 562 end_line: 562 @@ -429,7 +429,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 1099 end_line: 1099 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/ghostscript/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/ghostscript/stable_copyright-detailed.expected.yml index 7379bbfbf2..9040cc1983 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/ghostscript/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/ghostscript/stable_copyright-detailed.expected.yml @@ -92,7 +92,7 @@ license_detections: license_expression_spdx: AGPL-3.0-only WITH PS-or-PDF-font-exception-20170817 matches: - license_expression: agpl-3.0 WITH ps-or-pdf-font-exception-20170817 - spdx_license_expression: AGPL-3.0-only WITH PS-or-PDF-font-exception-20170817 + license_expression_spdx: AGPL-3.0-only WITH PS-or-PDF-font-exception-20170817 from_file: start_line: 173 end_line: 178 @@ -115,7 +115,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-sunsoft matches: - license_expression: sunsoft - spdx_license_expression: LicenseRef-scancode-sunsoft + license_expression_spdx: LicenseRef-scancode-sunsoft from_file: start_line: 294 end_line: 298 @@ -137,7 +137,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 309 end_line: 313 @@ -159,7 +159,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 448 end_line: 451 @@ -180,7 +180,7 @@ license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 497 end_line: 497 @@ -197,7 +197,7 @@ license_detections: license_expression_spdx: AGPL-3.0-only matches: - license_expression: agpl-3.0 - spdx_license_expression: AGPL-3.0-only + license_expression_spdx: AGPL-3.0-only from_file: start_line: 501 end_line: 1350 @@ -1064,7 +1064,7 @@ license_detections: license_expression_spdx: FSFUL matches: - license_expression: fsf-free - spdx_license_expression: FSFUL + license_expression_spdx: FSFUL from_file: start_line: 1371 end_line: 1373 @@ -1084,7 +1084,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 1376 end_line: 1398 @@ -1124,7 +1124,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 1401 end_line: 1423 @@ -1164,7 +1164,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 1426 end_line: 1442 @@ -1198,7 +1198,7 @@ license_detections: license_expression_spdx: MIT-open-group matches: - license_expression: x11-opengroup - spdx_license_expression: MIT-open-group + license_expression_spdx: MIT-open-group from_file: start_line: 1445 end_line: 1464 @@ -1235,7 +1235,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ghostpdl-permissive matches: - license_expression: ghostpdl-permissive - spdx_license_expression: LicenseRef-scancode-ghostpdl-permissive + license_expression_spdx: LicenseRef-scancode-ghostpdl-permissive from_file: start_line: 1467 end_line: 1471 @@ -1257,7 +1257,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-x11-lucent-variant matches: - license_expression: x11-lucent-variant - spdx_license_expression: LicenseRef-scancode-x11-lucent-variant + license_expression_spdx: LicenseRef-scancode-x11-lucent-variant from_file: start_line: 1474 end_line: 1485 @@ -1286,7 +1286,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1488 end_line: 1519 @@ -1335,7 +1335,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1522 end_line: 1558 @@ -1389,7 +1389,7 @@ license_detections: license_expression_spdx: FTL matches: - license_expression: freetype - spdx_license_expression: FTL + license_expression_spdx: FTL from_file: start_line: 1561 end_line: 1740 @@ -1586,7 +1586,7 @@ license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 1743 end_line: 1762 @@ -1623,7 +1623,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 1765 end_line: 1779 @@ -1655,7 +1655,7 @@ license_detections: license_expression_spdx: AGPL-3.0-only AND AGPL-3.0-or-later matches: - license_expression: agpl-3.0 - spdx_license_expression: AGPL-3.0-only + license_expression_spdx: AGPL-3.0-only from_file: start_line: 73 end_line: 73 @@ -1668,7 +1668,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_191.RULE matched_text: 'License: agpl-' - license_expression: agpl-3.0-plus - spdx_license_expression: AGPL-3.0-or-later + license_expression_spdx: AGPL-3.0-or-later from_file: start_line: 73 end_line: 73 @@ -1685,7 +1685,7 @@ license_detections: license_expression_spdx: AGPL-3.0-or-later matches: - license_expression: agpl-3.0-plus - spdx_license_expression: AGPL-3.0-or-later + license_expression_spdx: AGPL-3.0-or-later from_file: start_line: 68 end_line: 72 @@ -1707,7 +1707,7 @@ license_detections: license_expression_spdx: AGPL-3.0-or-later matches: - license_expression: agpl-3.0-plus - spdx_license_expression: AGPL-3.0-or-later + license_expression_spdx: AGPL-3.0-or-later from_file: start_line: 76 end_line: 76 @@ -1724,7 +1724,7 @@ license_detections: license_expression_spdx: AGPL-3.0-only AND AGPL-3.0-or-later matches: - license_expression: agpl-3.0 - spdx_license_expression: AGPL-3.0-only + license_expression_spdx: AGPL-3.0-only from_file: start_line: 91 end_line: 91 @@ -1737,7 +1737,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_191.RULE matched_text: 'License: agpl-' - license_expression: agpl-3.0-plus - spdx_license_expression: AGPL-3.0-or-later + license_expression_spdx: AGPL-3.0-or-later from_file: start_line: 91 end_line: 91 @@ -1754,7 +1754,7 @@ license_detections: license_expression_spdx: AGPL-3.0-or-later matches: - license_expression: agpl-3.0-plus - spdx_license_expression: AGPL-3.0-or-later + license_expression_spdx: AGPL-3.0-or-later from_file: start_line: 86 end_line: 90 @@ -1776,7 +1776,7 @@ license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 96 end_line: 98 @@ -1796,7 +1796,7 @@ license_detections: license_expression_spdx: FTL matches: - license_expression: freetype - spdx_license_expression: FTL + license_expression_spdx: FTL from_file: start_line: 121 end_line: 126 @@ -1819,7 +1819,7 @@ license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 135 end_line: 142 @@ -1844,7 +1844,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ghostscript-1988 matches: - license_expression: ghostscript-1988 - spdx_license_expression: LicenseRef-scancode-ghostscript-1988 + license_expression_spdx: LicenseRef-scancode-ghostscript-1988 from_file: start_line: 151 end_line: 158 @@ -1869,7 +1869,7 @@ license_detections: license_expression_spdx: AGPL-3.0-or-later matches: - license_expression: agpl-3.0-plus - spdx_license_expression: AGPL-3.0-or-later + license_expression_spdx: AGPL-3.0-or-later from_file: start_line: 167 end_line: 171 @@ -1891,7 +1891,7 @@ license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 183 end_line: '190' @@ -1916,7 +1916,7 @@ license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 201 end_line: 208 @@ -1941,7 +1941,7 @@ license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 225 end_line: 234 @@ -1968,7 +1968,7 @@ license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 236 end_line: 236 @@ -1985,7 +1985,7 @@ license_detections: license_expression_spdx: GPL-1.0-or-later OR LicenseRef-scancode-cups matches: - license_expression: gpl-1.0-plus OR cups - spdx_license_expression: GPL-1.0-or-later OR LicenseRef-scancode-cups + license_expression_spdx: GPL-1.0-or-later OR LicenseRef-scancode-cups from_file: start_line: 243 end_line: 251 @@ -2011,7 +2011,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 262 end_line: 265 @@ -2032,7 +2032,7 @@ license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 320 end_line: 329 @@ -2059,7 +2059,7 @@ license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 338 end_line: 341 @@ -2080,7 +2080,7 @@ license_detections: license_expression_spdx: AGPL-3.0-only AND AGPL-3.0-or-later matches: - license_expression: agpl-3.0 - spdx_license_expression: AGPL-3.0-only + license_expression_spdx: AGPL-3.0-only from_file: start_line: 352 end_line: 352 @@ -2093,7 +2093,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/agpl-3.0_191.RULE matched_text: 'License: agpl-' - license_expression: agpl-3.0-plus - spdx_license_expression: AGPL-3.0-or-later + license_expression_spdx: AGPL-3.0-or-later from_file: start_line: 352 end_line: 352 @@ -2110,7 +2110,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-afpl-9.0 matches: - license_expression: afpl-9.0 - spdx_license_expression: LicenseRef-scancode-afpl-9.0 + license_expression_spdx: LicenseRef-scancode-afpl-9.0 from_file: start_line: 350 end_line: 350 @@ -2127,7 +2127,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 363 end_line: 367 @@ -2149,7 +2149,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 375 end_line: 379 @@ -2171,7 +2171,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 390 end_line: 394 @@ -2193,7 +2193,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 402 end_line: 406 @@ -2215,7 +2215,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 412 end_line: 416 @@ -2237,7 +2237,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 422 end_line: 426 @@ -2259,7 +2259,7 @@ license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 458 end_line: 465 @@ -2284,7 +2284,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 488 end_line: 492 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/glib2.0/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/glib2.0/stable_copyright-detailed.expected.yml index 0dae2062c9..d321fb6800 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/glib2.0/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/glib2.0/stable_copyright-detailed.expected.yml @@ -10,7 +10,7 @@ license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 45 end_line: 60 @@ -43,7 +43,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 66 end_line: 66 @@ -60,7 +60,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 74 end_line: 74 @@ -77,7 +77,7 @@ license_detections: license_expression_spdx: Apache-2.0 AND MIT AND GPL-2.0-or-later matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 80 end_line: 82 @@ -93,7 +93,7 @@ license_detections: License: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 82 end_line: 96 @@ -121,7 +121,7 @@ license_detections: On Debian systems, a copy of the Apache license is available in . - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 98 end_line: 98 @@ -134,7 +134,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE matched_text: 'License: Expat' - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 99 end_line: 115 @@ -164,7 +164,7 @@ license_detections: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 117 end_line: 117 @@ -177,7 +177,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: GPL-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 118 end_line: 129 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnome-bluetooth/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnome-bluetooth/stable_copyright-detailed.expected.yml index c955f65681..76a1737867 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnome-bluetooth/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnome-bluetooth/stable_copyright-detailed.expected.yml @@ -18,7 +18,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 27 end_line: 27 @@ -31,7 +31,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 28 end_line: 42 @@ -63,7 +63,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 44 end_line: 44 @@ -76,7 +76,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 45 end_line: 59 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnome-control-center/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnome-control-center/stable_copyright-detailed.expected.yml index 0f86507e5c..ee885dbf12 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnome-control-center/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnome-control-center/stable_copyright-detailed.expected.yml @@ -20,7 +20,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 105 end_line: 105 @@ -33,7 +33,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 106 end_line: 114 @@ -55,7 +55,7 @@ other_license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 116 end_line: 117 @@ -74,7 +74,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 120 end_line: 136 @@ -108,7 +108,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-only matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 138 end_line: 138 @@ -121,7 +121,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 139 end_line: 147 @@ -143,7 +143,7 @@ other_license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 149 end_line: 150 @@ -162,7 +162,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 152 end_line: 152 @@ -175,7 +175,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 153 end_line: 161 @@ -197,7 +197,7 @@ other_license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 163 end_line: 164 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnupg2/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnupg2/stable_copyright-detailed.expected.yml index 7a3f286aaf..bbd855f554 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnupg2/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/gnupg2/stable_copyright-detailed.expected.yml @@ -41,7 +41,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 85 end_line: 110 @@ -84,7 +84,7 @@ other_license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 114 end_line: 121 @@ -109,7 +109,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-ietf matches: - license_expression: ietf - spdx_license_expression: LicenseRef-scancode-ietf + license_expression_spdx: LicenseRef-scancode-ietf from_file: start_line: 129 end_line: 144 @@ -142,7 +142,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 147 end_line: 147 @@ -155,7 +155,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 148 end_line: 163 @@ -188,7 +188,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 165 end_line: 165 @@ -201,7 +201,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 166 end_line: 181 @@ -234,7 +234,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 183 end_line: 183 @@ -247,7 +247,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 184 end_line: '199' @@ -280,7 +280,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 202 end_line: 225 @@ -321,7 +321,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 228 end_line: 245 @@ -356,7 +356,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 247 end_line: 247 @@ -369,7 +369,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE matched_text: 'License: cc0-1.0' - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 248 end_line: 253 @@ -392,7 +392,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 81 end_line: 81 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/golang-1.11/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/golang-1.11/stable_copyright-detailed.expected.yml index 10e10c5d40..4ef53455c7 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/golang-1.11/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/golang-1.11/stable_copyright-detailed.expected.yml @@ -43,7 +43,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 187 end_line: 188 @@ -62,7 +62,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 226 end_line: 250 @@ -104,7 +104,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 255 end_line: 279 @@ -142,7 +142,7 @@ other_license_detections: (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: google-patent-license-golang - spdx_license_expression: LicenseRef-scancode-google-patent-license-golang + license_expression_spdx: LicenseRef-scancode-google-patent-license-golang from_file: start_line: 281 end_line: 294 @@ -173,7 +173,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 296 end_line: 296 @@ -186,7 +186,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 297 end_line: 310 @@ -217,7 +217,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 313 end_line: 329 @@ -251,7 +251,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 336 end_line: 355 @@ -288,7 +288,7 @@ other_license_detections: license_expression_spdx: MPEG-SSG matches: - license_expression: mpeg-ssg - spdx_license_expression: MPEG-SSG + license_expression_spdx: MPEG-SSG from_file: start_line: 358 end_line: 376 @@ -324,7 +324,7 @@ other_license_detections: license_expression_spdx: CC-BY-3.0 matches: - license_expression: cc-by-3.0 - spdx_license_expression: CC-BY-3.0 + license_expression_spdx: CC-BY-3.0 from_file: start_line: 379 end_line: 705 @@ -668,7 +668,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause-Views matches: - license_expression: bsd-2-clause-views - spdx_license_expression: BSD-2-Clause-Views + license_expression_spdx: BSD-2-Clause-Views from_file: start_line: 708 end_line: 731 @@ -709,7 +709,7 @@ other_license_detections: license_expression_spdx: SunPro matches: - license_expression: sunpro - spdx_license_expression: SunPro + license_expression_spdx: SunPro from_file: start_line: 171 end_line: 174 @@ -730,7 +730,7 @@ other_license_detections: license_expression_spdx: CC-BY-3.0 matches: - license_expression: cc-by-3.0 - spdx_license_expression: CC-BY-3.0 + license_expression_spdx: CC-BY-3.0 from_file: start_line: 209 end_line: 211 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/lacme/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/lacme/stable_copyright-detailed.expected.yml index b5fb8a0edc..0a9bb75b18 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/lacme/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/lacme/stable_copyright-detailed.expected.yml @@ -11,7 +11,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 8 end_line: 8 @@ -24,7 +24,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 9 end_line: 15 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-amd64/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-amd64/stable_copyright-detailed.expected.yml index 0813a8a8c8..f3ad657a12 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-amd64/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-amd64/stable_copyright-detailed.expected.yml @@ -25,7 +25,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later matches: - license_expression: bsd-new OR gpl-1.0-plus - spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later + license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later from_file: start_line: 91 end_line: 121 @@ -73,7 +73,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 126 end_line: 156 @@ -121,7 +121,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 171 end_line: 187 @@ -155,7 +155,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: '194' end_line: '194' @@ -168,7 +168,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: '195' end_line: 209 @@ -200,7 +200,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 211 end_line: 211 @@ -213,7 +213,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 212 end_line: 223 @@ -238,7 +238,7 @@ other_license_detections: You should have received a copy of the GNU Lesser General Public License along with this program; If not, see . - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 225 end_line: 226 @@ -257,7 +257,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later OR MIT matches: - license_expression: gpl-2.0-plus OR mit - spdx_license_expression: GPL-2.0-or-later OR MIT + license_expression_spdx: GPL-2.0-or-later OR MIT from_file: start_line: 229 end_line: 265 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-arm64/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-arm64/stable_copyright-detailed.expected.yml index 0813a8a8c8..f3ad657a12 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-arm64/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-arm64/stable_copyright-detailed.expected.yml @@ -25,7 +25,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later matches: - license_expression: bsd-new OR gpl-1.0-plus - spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later + license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later from_file: start_line: 91 end_line: 121 @@ -73,7 +73,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 126 end_line: 156 @@ -121,7 +121,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 171 end_line: 187 @@ -155,7 +155,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: '194' end_line: '194' @@ -168,7 +168,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: '195' end_line: 209 @@ -200,7 +200,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 211 end_line: 211 @@ -213,7 +213,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 212 end_line: 223 @@ -238,7 +238,7 @@ other_license_detections: You should have received a copy of the GNU Lesser General Public License along with this program; If not, see . - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 225 end_line: 226 @@ -257,7 +257,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later OR MIT matches: - license_expression: gpl-2.0-plus OR mit - spdx_license_expression: GPL-2.0-or-later OR MIT + license_expression_spdx: GPL-2.0-or-later OR MIT from_file: start_line: 229 end_line: 265 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-i386/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-i386/stable_copyright-detailed.expected.yml index 0813a8a8c8..f3ad657a12 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-i386/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux-signed-i386/stable_copyright-detailed.expected.yml @@ -25,7 +25,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later matches: - license_expression: bsd-new OR gpl-1.0-plus - spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later + license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later from_file: start_line: 91 end_line: 121 @@ -73,7 +73,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 126 end_line: 156 @@ -121,7 +121,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 171 end_line: 187 @@ -155,7 +155,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: '194' end_line: '194' @@ -168,7 +168,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: '195' end_line: 209 @@ -200,7 +200,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 211 end_line: 211 @@ -213,7 +213,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 212 end_line: 223 @@ -238,7 +238,7 @@ other_license_detections: You should have received a copy of the GNU Lesser General Public License along with this program; If not, see . - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 225 end_line: 226 @@ -257,7 +257,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later OR MIT matches: - license_expression: gpl-2.0-plus OR mit - spdx_license_expression: GPL-2.0-or-later OR MIT + license_expression_spdx: GPL-2.0-or-later OR MIT from_file: start_line: 229 end_line: 265 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux/stable_copyright-detailed.expected.yml index 0813a8a8c8..f3ad657a12 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/l/linux/stable_copyright-detailed.expected.yml @@ -25,7 +25,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later matches: - license_expression: bsd-new OR gpl-1.0-plus - spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later + license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later from_file: start_line: 91 end_line: 121 @@ -73,7 +73,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 126 end_line: 156 @@ -121,7 +121,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 171 end_line: 187 @@ -155,7 +155,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: '194' end_line: '194' @@ -168,7 +168,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: '195' end_line: 209 @@ -200,7 +200,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 211 end_line: 211 @@ -213,7 +213,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 212 end_line: 223 @@ -238,7 +238,7 @@ other_license_detections: You should have received a copy of the GNU Lesser General Public License along with this program; If not, see . - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 225 end_line: 226 @@ -257,7 +257,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later OR MIT matches: - license_expression: gpl-2.0-plus OR mit - spdx_license_expression: GPL-2.0-or-later OR MIT + license_expression_spdx: GPL-2.0-or-later OR MIT from_file: start_line: 229 end_line: 265 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libs/libsdl2-image/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libs/libsdl2-image/stable_copyright-detailed.expected.yml index e43ce5cae1..5a0f79d130 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libs/libsdl2-image/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libs/libsdl2-image/stable_copyright-detailed.expected.yml @@ -18,7 +18,7 @@ other_license_detections: license_expression_spdx: Unlicense matches: - license_expression: unlicense - spdx_license_expression: Unlicense + license_expression_spdx: Unlicense from_file: start_line: 33 end_line: 54 @@ -57,7 +57,7 @@ other_license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 63 end_line: 77 @@ -89,7 +89,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 79 end_line: 79 @@ -102,7 +102,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 80 end_line: 86 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libt/libtk-img/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libt/libtk-img/stable_copyright-detailed.expected.yml index 8c29286a83..8ca09dd21e 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libt/libtk-img/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libt/libtk-img/stable_copyright-detailed.expected.yml @@ -13,7 +13,7 @@ other_license_detections: license_expression_spdx: TCL matches: - license_expression: tcl - spdx_license_expression: TCL + license_expression_spdx: TCL from_file: start_line: 13 end_line: 53 @@ -71,7 +71,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-pngsuite matches: - license_expression: pngsuite - spdx_license_expression: LicenseRef-scancode-pngsuite + license_expression_spdx: LicenseRef-scancode-pngsuite from_file: start_line: 56 end_line: 57 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libx/libxslt/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libx/libxslt/stable_copyright-detailed.expected.yml index e7ae062b76..1b42910cb0 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libx/libxslt/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/libx/libxslt/stable_copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-x11-xconsortium-veillard matches: - license_expression: x11-xconsortium-veillard - spdx_license_expression: LicenseRef-scancode-x11-xconsortium-veillard + license_expression_spdx: LicenseRef-scancode-x11-xconsortium-veillard from_file: start_line: 15 end_line: 34 @@ -45,7 +45,7 @@ license_detections: license_expression_spdx: X11 matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: 43 end_line: 62 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/m/mariadb-10.3/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/m/mariadb-10.3/stable_copyright-detailed.expected.yml index 4cfd3a7657..6f73ed8d2d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/m/mariadb-10.3/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/m/mariadb-10.3/stable_copyright-detailed.expected.yml @@ -151,7 +151,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-copyleft matches: - license_expression: other-copyleft - spdx_license_expression: LicenseRef-scancode-other-copyleft + license_expression_spdx: LicenseRef-scancode-other-copyleft from_file: start_line: 304 end_line: 305 @@ -170,7 +170,7 @@ other_license_detections: license_expression_spdx: FSFUL matches: - license_expression: fsf-free - spdx_license_expression: FSFUL + license_expression_spdx: FSFUL from_file: start_line: 386 end_line: 387 @@ -189,7 +189,7 @@ other_license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 505 end_line: 519 @@ -221,7 +221,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later WITH Bison-exception-2.2 matches: - license_expression: gpl-2.0-plus WITH bison-exception-2.2 - spdx_license_expression: GPL-2.0-or-later WITH Bison-exception-2.2 + license_expression_spdx: GPL-2.0-or-later WITH Bison-exception-2.2 from_file: start_line: 562 end_line: 588 @@ -265,7 +265,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2 matches: - license_expression: gpl-3.0-plus WITH bison-exception-2.2 - spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2 + license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2 from_file: start_line: 597 end_line: 621 @@ -307,7 +307,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-stlport-4.5 matches: - license_expression: stlport-4.5 - spdx_license_expression: LicenseRef-scancode-stlport-4.5 + license_expression_spdx: LicenseRef-scancode-stlport-4.5 from_file: start_line: 734 end_line: 741 @@ -332,7 +332,7 @@ other_license_detections: license_expression_spdx: X11 AND LicenseRef-scancode-public-domain matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: 807 end_line: 827 @@ -366,7 +366,7 @@ other_license_detections: ings in this Software without prior written authorization from the X Consor- tium. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 829 end_line: 829 @@ -383,7 +383,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 850 end_line: 850 @@ -396,7 +396,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 851 end_line: 865 @@ -428,7 +428,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 867 end_line: 867 @@ -441,7 +441,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 868 end_line: 883 @@ -474,7 +474,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 885 end_line: 885 @@ -487,7 +487,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 886 end_line: 902 @@ -521,7 +521,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.0-only matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 904 end_line: 904 @@ -534,7 +534,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE matched_text: 'License: lgpl' - license_expression: lgpl-2.0 - spdx_license_expression: LGPL-2.0-only + license_expression_spdx: LGPL-2.0-only from_file: start_line: 905 end_line: 922 @@ -569,7 +569,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 925 end_line: 934 @@ -596,7 +596,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 937 end_line: 959 @@ -636,7 +636,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl matches: - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 961 end_line: 961 @@ -649,7 +649,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE matched_text: 'License: artistic' - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 962 end_line: 1088 @@ -793,7 +793,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 1091 end_line: 1091 @@ -810,7 +810,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1093 end_line: 1093 @@ -823,7 +823,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1094 end_line: 1108 @@ -855,7 +855,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-only matches: - license_expression: lgpl-2.0 - spdx_license_expression: LGPL-2.0-only + license_expression_spdx: LGPL-2.0-only from_file: start_line: 1110 end_line: 1110 @@ -868,7 +868,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_12.RULE matched_text: 'License: lgpl-2' - license_expression: lgpl-2.0 - spdx_license_expression: LGPL-2.0-only + license_expression_spdx: LGPL-2.0-only from_file: start_line: 1111 end_line: 1124 @@ -899,7 +899,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 201 end_line: 210 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncbi-tools6/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncbi-tools6/stable_copyright-detailed.expected.yml index f0c593a11d..0ea5af0986 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncbi-tools6/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncbi-tools6/stable_copyright-detailed.expected.yml @@ -41,7 +41,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain AND LicenseRef-scancode-us-govt-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 92 end_line: 92 @@ -54,7 +54,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_128.RULE matched_text: put into the public domain, - license_expression: us-govt-public-domain - spdx_license_expression: LicenseRef-scancode-us-govt-public-domain + license_expression_spdx: LicenseRef-scancode-us-govt-public-domain from_file: start_line: 94 end_line: 112 @@ -90,7 +90,7 @@ other_license_detections: license_expression_spdx: BSL-1.0 matches: - license_expression: boost-1.0 - spdx_license_expression: BSL-1.0 + license_expression_spdx: BSL-1.0 from_file: start_line: 115 end_line: 135 @@ -128,7 +128,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 138 end_line: 154 @@ -162,7 +162,7 @@ other_license_detections: license_expression_spdx: HPND-export-US-modify AND LicenseRef-scancode-proprietary-license matches: - license_expression: mit-with-modification-obligations - spdx_license_expression: HPND-export-US-modify + license_expression_spdx: HPND-export-US-modify from_file: start_line: 157 end_line: 172 @@ -191,7 +191,7 @@ other_license_detections: WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 179 end_line: 185 @@ -215,7 +215,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 188 end_line: '194' @@ -239,7 +239,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause-flex matches: - license_expression: flex-2.5 - spdx_license_expression: BSD-3-Clause-flex + license_expression_spdx: BSD-3-Clause-flex from_file: start_line: '197' end_line: 209 @@ -269,7 +269,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 211 end_line: 211 @@ -282,7 +282,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 212 end_line: 231 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncurses/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncurses/stable_copyright-detailed.expected.yml index b5ad803f60..d4a498b4f7 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncurses/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/ncurses/stable_copyright-detailed.expected.yml @@ -9,7 +9,7 @@ license_detections: license_expression_spdx: X11-distribute-modifications-variant matches: - license_expression: x11-fsf - spdx_license_expression: X11-distribute-modifications-variant + license_expression_spdx: X11-distribute-modifications-variant from_file: start_line: 23 end_line: 45 @@ -49,7 +49,7 @@ license_detections: license_expression_spdx: X11 matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: 50 end_line: 70 @@ -87,7 +87,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 76 end_line: 98 @@ -127,7 +127,7 @@ license_detections: license_expression_spdx: X11 matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: 105 end_line: 127 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/newsboat/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/newsboat/stable_copyright-detailed.expected.yml index 31b32e27dc..420eb74174 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/newsboat/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/newsboat/stable_copyright-detailed.expected.yml @@ -20,7 +20,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 30 end_line: 46 @@ -54,7 +54,7 @@ other_license_detections: license_expression_spdx: BSL-1.0 matches: - license_expression: boost-1.0 - spdx_license_expression: BSL-1.0 + license_expression_spdx: BSL-1.0 from_file: start_line: 49 end_line: 70 @@ -93,7 +93,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 72 end_line: 72 @@ -106,7 +106,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 73 end_line: 78 @@ -129,7 +129,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 80 end_line: 80 @@ -142,7 +142,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 81 end_line: 87 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/nextcloud-desktop/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/nextcloud-desktop/stable_copyright-detailed.expected.yml index 15e6a56887..848ca08ad0 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/nextcloud-desktop/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/nextcloud-desktop/stable_copyright-detailed.expected.yml @@ -45,7 +45,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 AND LGPL-2.1-only matches: - license_expression: apache-2.0 AND lgpl-2.1 - spdx_license_expression: Apache-2.0 AND LGPL-2.1-only + license_expression_spdx: Apache-2.0 AND LGPL-2.1-only from_file: start_line: 162 end_line: 175 @@ -76,7 +76,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 178 end_line: '199' @@ -115,7 +115,7 @@ other_license_detections: license_expression_spdx: BSL-1.0 matches: - license_expression: boost-1.0 - spdx_license_expression: BSL-1.0 + license_expression_spdx: BSL-1.0 from_file: start_line: 202 end_line: 222 @@ -153,7 +153,7 @@ other_license_detections: license_expression_spdx: CC-BY-3.0 matches: - license_expression: cc-by-3.0 - spdx_license_expression: CC-BY-3.0 + license_expression_spdx: CC-BY-3.0 from_file: start_line: 225 end_line: 247 @@ -193,7 +193,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 250 end_line: 250 @@ -206,7 +206,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_26.RULE matched_text: The MIT License (MIT) - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 252 end_line: 268 @@ -240,7 +240,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 270 end_line: 270 @@ -253,7 +253,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 271 end_line: 283 @@ -279,7 +279,7 @@ other_license_detections: along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 285 end_line: 286 @@ -298,7 +298,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-only matches: - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 288 end_line: 288 @@ -311,7 +311,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_rdesc_1.RULE matched_text: 'License: gpl-3' - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 289 end_line: 303 @@ -343,7 +343,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 305 end_line: 305 @@ -356,7 +356,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 306 end_line: 314 @@ -382,7 +382,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 316 end_line: 316 @@ -395,7 +395,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 317 end_line: 332 @@ -428,7 +428,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer matches: - license_expression: public-domain-disclaimer - spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 335 end_line: 337 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/nginx/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/nginx/stable_copyright-detailed.expected.yml index b5e5243f35..d9b381f10d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/nginx/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/nginx/stable_copyright-detailed.expected.yml @@ -39,7 +39,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 110 end_line: 130 @@ -77,7 +77,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 135 end_line: 157 @@ -117,7 +117,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 160 end_line: 182 @@ -157,7 +157,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 185 end_line: 201 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/node-lodash/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/node-lodash/stable_copyright-detailed.expected.yml index 476d92609f..7ca1bab4cd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/node-lodash/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/n/node-lodash/stable_copyright-detailed.expected.yml @@ -19,7 +19,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 26 end_line: 45 @@ -56,7 +56,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 48 end_line: 67 @@ -93,7 +93,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 71 end_line: 71 @@ -106,7 +106,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 72 end_line: 86 @@ -138,7 +138,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-warranty-disclaimer matches: - license_expression: warranty-disclaimer - spdx_license_expression: LicenseRef-scancode-warranty-disclaimer + license_expression_spdx: LicenseRef-scancode-warranty-disclaimer from_file: start_line: 89 end_line: 89 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/open-infrastructure-compute-tools/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/open-infrastructure-compute-tools/stable_copyright-detailed.expected.yml index ac94b0c8fd..17982fc68a 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/open-infrastructure-compute-tools/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/open-infrastructure-compute-tools/stable_copyright-detailed.expected.yml @@ -11,7 +11,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-only matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 12 end_line: 12 @@ -24,7 +24,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 13 end_line: 24 @@ -49,7 +49,7 @@ other_license_detections: You should have received a copy of the GNU General Public License along with this program. If not, see . - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 26 end_line: 26 @@ -62,7 +62,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_378.RULE matched_text: the GNU General Public License version 3 - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 27 end_line: 27 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/open-vm-tools/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/open-vm-tools/stable_copyright-detailed.expected.yml index 8bc829e404..169fbd934f 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/open-vm-tools/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/open-vm-tools/stable_copyright-detailed.expected.yml @@ -24,7 +24,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 38 end_line: 61 @@ -58,7 +58,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 63 end_line: 63 @@ -71,7 +71,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 64 end_line: 74 @@ -95,7 +95,7 @@ other_license_detections: You should have received a copy of the GNU General Public License along with this program. If not, see . - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 76 end_line: 77 @@ -114,7 +114,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 79 end_line: 79 @@ -127,7 +127,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 80 end_line: 94 @@ -159,7 +159,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 96 end_line: 96 @@ -172,7 +172,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 97 end_line: 110 @@ -203,7 +203,7 @@ other_license_detections: license_expression_spdx: ISC AND LicenseRef-scancode-ibm-dhcp matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 113 end_line: 123 @@ -227,7 +227,7 @@ other_license_detections: ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - license_expression: ibm-dhcp - spdx_license_expression: LicenseRef-scancode-ibm-dhcp + license_expression_spdx: LicenseRef-scancode-ibm-dhcp from_file: start_line: 127 end_line: 145 @@ -263,7 +263,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-xfree86-1.0 matches: - license_expression: xfree86-1.0 - spdx_license_expression: LicenseRef-scancode-xfree86-1.0 + license_expression_spdx: LicenseRef-scancode-xfree86-1.0 from_file: start_line: 148 end_line: 169 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/openldap/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/openldap/stable_copyright-detailed.expected.yml index ef8c68dd16..f882c7ce36 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/openldap/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/openldap/stable_copyright-detailed.expected.yml @@ -15,7 +15,7 @@ license_detections: license_expression_spdx: OLDAP-2.8 matches: - license_expression: openldap-2.8 - spdx_license_expression: OLDAP-2.8 + license_expression_spdx: OLDAP-2.8 from_file: start_line: 17 end_line: 37 @@ -49,7 +49,7 @@ license_detections: Additional information about OpenLDAP can be obtained at . - license_expression: openldap-2.8 - spdx_license_expression: OLDAP-2.8 + license_expression_spdx: OLDAP-2.8 from_file: start_line: 41 end_line: 81 @@ -107,7 +107,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 91 end_line: 107 @@ -141,7 +141,7 @@ license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 115 end_line: 122 @@ -166,7 +166,7 @@ license_detections: license_expression_spdx: Spencer-94 matches: - license_expression: hs-regexp - spdx_license_expression: Spencer-94 + license_expression_spdx: Spencer-94 from_file: start_line: 129 end_line: 145 @@ -200,7 +200,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ibm-dhcp matches: - license_expression: ibm-dhcp - spdx_license_expression: LicenseRef-scancode-ibm-dhcp + license_expression_spdx: LicenseRef-scancode-ibm-dhcp from_file: start_line: 154 end_line: 173 @@ -237,7 +237,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ietf matches: - license_expression: ietf - spdx_license_expression: LicenseRef-scancode-ietf + license_expression_spdx: LicenseRef-scancode-ietf from_file: start_line: 180 end_line: 206 @@ -272,7 +272,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 227 end_line: 238 @@ -301,7 +301,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 245 end_line: 250 @@ -321,7 +321,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 277 end_line: 283 @@ -342,7 +342,7 @@ license_detections: license_expression_spdx: NTP matches: - license_expression: mit-old-style-no-advert - spdx_license_expression: NTP + license_expression_spdx: NTP from_file: start_line: 311 end_line: 319 @@ -368,7 +368,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 327 end_line: 328 @@ -387,7 +387,7 @@ license_detections: license_expression_spdx: Spencer-94 matches: - license_expression: hs-regexp - spdx_license_expression: Spencer-94 + license_expression_spdx: Spencer-94 from_file: start_line: 337 end_line: 352 @@ -420,7 +420,7 @@ license_detections: license_expression_spdx: OLDAP-2.8 matches: - license_expression: openldap-2.8 - spdx_license_expression: OLDAP-2.8 + license_expression_spdx: OLDAP-2.8 from_file: start_line: 359 end_line: 362 @@ -441,7 +441,7 @@ license_detections: license_expression_spdx: BSD-4.3TAHOE AND BSD-4-Clause-UC matches: - license_expression: bsla - spdx_license_expression: BSD-4.3TAHOE + license_expression_spdx: BSD-4.3TAHOE from_file: start_line: 368 end_line: 378 @@ -465,7 +465,7 @@ license_detections: * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 380 end_line: 381 @@ -484,7 +484,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 388 end_line: 414 @@ -524,7 +524,7 @@ license_detections: * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 416 end_line: 419 @@ -545,7 +545,7 @@ license_detections: license_expression_spdx: BSD-4.3RENO matches: - license_expression: bsd-original-uc-1986 - spdx_license_expression: BSD-4.3RENO + license_expression_spdx: BSD-4.3RENO from_file: start_line: 426 end_line: 431 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/osmpbf/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/osmpbf/stable_copyright-detailed.expected.yml index 0b59d14e00..b60a49db09 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/osmpbf/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/o/osmpbf/stable_copyright-detailed.expected.yml @@ -14,7 +14,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 15 end_line: 15 @@ -27,7 +27,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 16 end_line: 30 @@ -59,7 +59,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 32 end_line: 32 @@ -72,7 +72,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 33 end_line: 47 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pam-u2f/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pam-u2f/stable_copyright-detailed.expected.yml index 032dfa0ff2..b221bd7aa8 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pam-u2f/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pam-u2f/stable_copyright-detailed.expected.yml @@ -23,7 +23,7 @@ other_license_detections: license_expression_spdx: FSFULLR matches: - license_expression: fsf-unlimited - spdx_license_expression: FSFULLR + license_expression_spdx: FSFULLR from_file: start_line: 27 end_line: 29 @@ -43,7 +43,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception matches: - license_expression: gpl-2.0-plus WITH libtool-exception-2.0 - spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception + license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception from_file: start_line: 39 end_line: 51 @@ -73,7 +73,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 54 end_line: 54 @@ -86,7 +86,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 55 end_line: 61 @@ -110,7 +110,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 63 end_line: 63 @@ -123,7 +123,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 64 end_line: 70 @@ -147,7 +147,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 73 end_line: 95 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pango1.0/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pango1.0/stable_copyright-detailed.expected.yml index ed83120caf..7d81ed4749 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pango1.0/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pango1.0/stable_copyright-detailed.expected.yml @@ -34,7 +34,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 85 end_line: 87 @@ -54,7 +54,7 @@ other_license_detections: license_expression_spdx: ICU matches: - license_expression: x11 - spdx_license_expression: ICU + license_expression_spdx: ICU from_file: start_line: 90 end_line: 116 @@ -98,7 +98,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 118 end_line: 118 @@ -111,7 +111,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 119 end_line: 130 @@ -140,7 +140,7 @@ other_license_detections: license_expression_spdx: TCL matches: - license_expression: tcl - spdx_license_expression: TCL + license_expression_spdx: TCL from_file: start_line: 133 end_line: 171 @@ -196,7 +196,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 174 end_line: 224 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/perl/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/perl/copyright-detailed.expected.yml index 798f6d4534..2b1596f469 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/perl/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/perl/copyright-detailed.expected.yml @@ -741,7 +741,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 2100 end_line: 2100 @@ -754,7 +754,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 2101 end_line: 2102 @@ -773,7 +773,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later AND GPL-1.0-only matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 2104 end_line: 2104 @@ -786,7 +786,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_395.RULE matched_text: 'License: gpl-1+' - license_expression: gpl-1.0 - spdx_license_expression: GPL-1.0-only + license_expression_spdx: GPL-1.0-only from_file: start_line: 2105 end_line: 2106 @@ -805,7 +805,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 2108 end_line: 2108 @@ -818,7 +818,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 2109 end_line: 2111 @@ -838,7 +838,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl matches: - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 2113 end_line: 2113 @@ -851,7 +851,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE matched_text: 'License: artistic' - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 2114 end_line: 2115 @@ -870,7 +870,7 @@ other_license_detections: license_expression_spdx: Artistic-2.0 matches: - license_expression: artistic-2.0 - spdx_license_expression: Artistic-2.0 + license_expression_spdx: Artistic-2.0 from_file: start_line: 2118 end_line: 2299 @@ -1069,7 +1069,7 @@ other_license_detections: license_expression_spdx: bzip2-1.0.6 matches: - license_expression: bzip2-libbzip-2010 - spdx_license_expression: bzip2-1.0.6 + license_expression_spdx: bzip2-1.0.6 from_file: start_line: 2302 end_line: 2331 @@ -1116,7 +1116,7 @@ other_license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 2337 end_line: 2351 @@ -1148,7 +1148,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 2354 end_line: 2370 @@ -1182,7 +1182,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 2373 end_line: 2395 @@ -1222,7 +1222,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause matches: - license_expression: bsd-original - spdx_license_expression: BSD-4-Clause + license_expression_spdx: BSD-4-Clause from_file: start_line: 2398 end_line: 2424 @@ -1266,7 +1266,7 @@ other_license_detections: license_expression_spdx: Unicode-DFS-2015 matches: - license_expression: unicode-dfs-2015 - spdx_license_expression: Unicode-DFS-2015 + license_expression_spdx: Unicode-DFS-2015 from_file: start_line: 2428 end_line: 2482 @@ -1338,7 +1338,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 2485 end_line: 2507 @@ -1378,7 +1378,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 2510 end_line: 2532 @@ -1418,7 +1418,7 @@ other_license_detections: license_expression_spdx: Spencer-86 matches: - license_expression: regexp - spdx_license_expression: Spencer-86 + license_expression_spdx: Spencer-86 from_file: start_line: 2535 end_line: 2547 @@ -1448,7 +1448,7 @@ other_license_detections: license_expression_spdx: TTWL matches: - license_expression: ttwl - spdx_license_expression: TTWL + license_expression_spdx: TTWL from_file: start_line: 2550 end_line: 2554 @@ -1470,7 +1470,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-copyleft matches: - license_expression: other-copyleft - spdx_license_expression: LicenseRef-scancode-other-copyleft + license_expression_spdx: LicenseRef-scancode-other-copyleft from_file: start_line: 2557 end_line: 2559 @@ -1490,7 +1490,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-copyleft matches: - license_expression: other-copyleft - spdx_license_expression: LicenseRef-scancode-other-copyleft + license_expression_spdx: LicenseRef-scancode-other-copyleft from_file: start_line: 2562 end_line: 2563 @@ -1509,7 +1509,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 2569 end_line: 2569 @@ -1522,7 +1522,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_45.RULE matched_text: placed in the public domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 2574 end_line: 2574 @@ -1535,7 +1535,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_285.RULE matched_text: is in the public domain, - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 2575 end_line: 2575 @@ -1548,7 +1548,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE matched_text: public-domain - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 2584 end_line: 2584 @@ -1565,7 +1565,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2 matches: - license_expression: gpl-3.0-plus WITH bison-exception-2.2 - spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2 + license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2 from_file: start_line: 2588 end_line: 2612 @@ -1607,7 +1607,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-paul-hsieh-derivative matches: - license_expression: paul-hsieh-derivative - spdx_license_expression: LicenseRef-scancode-paul-hsieh-derivative + license_expression_spdx: LicenseRef-scancode-paul-hsieh-derivative from_file: start_line: 2615 end_line: 2630 @@ -1640,7 +1640,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-bsd-x11 matches: - license_expression: bsd-x11 - spdx_license_expression: LicenseRef-scancode-bsd-x11 + license_expression_spdx: LicenseRef-scancode-bsd-x11 from_file: start_line: 2636 end_line: 2661 @@ -1683,7 +1683,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 2663 end_line: 2663 @@ -1696,7 +1696,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE matched_text: 'License: cc0-1.0' - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 2664 end_line: 2783 @@ -1833,7 +1833,7 @@ other_license_detections: license_expression_spdx: FSFAP matches: - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 2790 end_line: 2793 @@ -1854,7 +1854,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 matches: - license_expression: artistic-dist-1.0 - spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0 + license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 from_file: start_line: 2796 end_line: 2920 @@ -1996,7 +1996,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 20 end_line: 27 @@ -2021,7 +2021,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 47 end_line: 47 @@ -2038,7 +2038,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 54 end_line: 54 @@ -2055,7 +2055,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 64 end_line: 64 @@ -2072,7 +2072,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 72 end_line: 72 @@ -2089,7 +2089,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 82 end_line: 82 @@ -2106,7 +2106,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 113 end_line: 114 @@ -2125,7 +2125,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 126 end_line: 127 @@ -2144,7 +2144,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 136 end_line: 136 @@ -2161,7 +2161,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 146 end_line: 148 @@ -2181,7 +2181,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 154 end_line: 155 @@ -2200,7 +2200,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 162 end_line: 163 @@ -2219,7 +2219,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 170 end_line: 170 @@ -2236,7 +2236,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 177 end_line: 177 @@ -2253,7 +2253,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 185 end_line: 185 @@ -2270,7 +2270,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: '195' end_line: '196' @@ -2289,7 +2289,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 202 end_line: 203 @@ -2308,7 +2308,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 212 end_line: 213 @@ -2327,7 +2327,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 220 end_line: 221 @@ -2346,7 +2346,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 228 end_line: 229 @@ -2365,7 +2365,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 236 end_line: 237 @@ -2384,7 +2384,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 246 end_line: 247 @@ -2403,7 +2403,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 258 end_line: 258 @@ -2420,7 +2420,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 264 end_line: 265 @@ -2439,7 +2439,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 278 end_line: 278 @@ -2456,7 +2456,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 284 end_line: 285 @@ -2475,7 +2475,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 293 end_line: 295 @@ -2495,7 +2495,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 303 end_line: 304 @@ -2514,7 +2514,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 312 end_line: 319 @@ -2539,7 +2539,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 325 end_line: 326 @@ -2558,7 +2558,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 345 end_line: 346 @@ -2577,7 +2577,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 358 end_line: 359 @@ -2596,7 +2596,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 365 end_line: 366 @@ -2615,7 +2615,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 374 end_line: 374 @@ -2632,7 +2632,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 382 end_line: 383 @@ -2651,7 +2651,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 394 end_line: 395 @@ -2670,7 +2670,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 402 end_line: 403 @@ -2689,7 +2689,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 410 end_line: 411 @@ -2708,7 +2708,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 417 end_line: 418 @@ -2727,7 +2727,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 427 end_line: 428 @@ -2746,7 +2746,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 435 end_line: 436 @@ -2765,7 +2765,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 444 end_line: 445 @@ -2784,7 +2784,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 454 end_line: 455 @@ -2803,7 +2803,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 462 end_line: 463 @@ -2822,7 +2822,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 469 end_line: 470 @@ -2841,7 +2841,7 @@ other_license_detections: license_expression_spdx: Artistic-2.0 matches: - license_expression: artistic-2.0 - spdx_license_expression: Artistic-2.0 + license_expression_spdx: Artistic-2.0 from_file: start_line: 476 end_line: 477 @@ -2860,7 +2860,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 484 end_line: 485 @@ -2879,7 +2879,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 492 end_line: 493 @@ -2898,7 +2898,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 500 end_line: 509 @@ -2925,7 +2925,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 517 end_line: 518 @@ -2944,7 +2944,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 524 end_line: 525 @@ -2963,7 +2963,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 540 end_line: 541 @@ -2982,7 +2982,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 549 end_line: 550 @@ -3001,7 +3001,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 558 end_line: 559 @@ -3020,7 +3020,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 568 end_line: 569 @@ -3039,7 +3039,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-2.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later from_file: start_line: 576 end_line: 580 @@ -3061,7 +3061,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 587 end_line: 588 @@ -3080,7 +3080,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 595 end_line: 596 @@ -3099,7 +3099,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 603 end_line: 604 @@ -3118,7 +3118,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 613 end_line: 614 @@ -3137,7 +3137,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 621 end_line: 622 @@ -3156,7 +3156,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 630 end_line: 631 @@ -3175,7 +3175,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 638 end_line: 639 @@ -3194,7 +3194,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 646 end_line: 647 @@ -3213,7 +3213,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 657 end_line: 658 @@ -3232,7 +3232,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 664 end_line: 665 @@ -3251,7 +3251,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 676 end_line: 677 @@ -3270,7 +3270,7 @@ other_license_detections: license_expression_spdx: MIT OR GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: mit OR gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: MIT OR GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: MIT OR GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 684 end_line: 686 @@ -3290,7 +3290,7 @@ other_license_detections: license_expression_spdx: MIT OR Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: mit OR artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: MIT OR Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: MIT OR Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 700 end_line: 701 @@ -3309,7 +3309,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 707 end_line: 708 @@ -3328,7 +3328,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 715 end_line: 719 @@ -3350,7 +3350,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 727 end_line: 728 @@ -3369,7 +3369,7 @@ other_license_detections: license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND metamail matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 736 end_line: 737 @@ -3384,7 +3384,7 @@ other_license_detections: This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: metamail - spdx_license_expression: metamail + license_expression_spdx: metamail from_file: start_line: 744 end_line: 753 @@ -3411,7 +3411,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 761 end_line: 762 @@ -3430,7 +3430,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 769 end_line: 770 @@ -3449,7 +3449,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 777 end_line: 777 @@ -3466,7 +3466,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 784 end_line: 785 @@ -3485,7 +3485,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 792 end_line: 793 @@ -3504,7 +3504,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 800 end_line: 801 @@ -3523,7 +3523,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 808 end_line: 810 @@ -3543,7 +3543,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 817 end_line: 818 @@ -3562,7 +3562,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 827 end_line: 828 @@ -3581,7 +3581,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 836 end_line: 837 @@ -3600,7 +3600,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 868 end_line: 869 @@ -3619,7 +3619,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 882 end_line: 883 @@ -3638,7 +3638,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 890 end_line: 891 @@ -3657,7 +3657,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 898 end_line: 900 @@ -3677,7 +3677,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 908 end_line: 909 @@ -3696,7 +3696,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 916 end_line: 917 @@ -3715,7 +3715,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 924 end_line: 925 @@ -3735,7 +3735,7 @@ other_license_detections: AND LicenseRef-scancode-public-domain-disclaimer) matches: - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 939 end_line: 943 @@ -3753,7 +3753,7 @@ other_license_detections: of Perl or of its documentation (printed or otherwise), this works is covered under Perl's Artistic License. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 946 end_line: 950 @@ -3771,7 +3771,7 @@ other_license_detections: see fit. A simple comment in the code giving credit to the FAQ would be courteous but is not required. - license_expression: artistic-2.0 AND public-domain-disclaimer - spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 954 end_line: 956 @@ -3791,7 +3791,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 964 end_line: 966 @@ -3811,7 +3811,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 973 end_line: 974 @@ -3830,7 +3830,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 981 end_line: 982 @@ -3849,7 +3849,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 998 end_line: 999 @@ -3868,7 +3868,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1017 end_line: 1018 @@ -3887,7 +3887,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1025 end_line: 1026 @@ -3906,7 +3906,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1033 end_line: 1034 @@ -3925,7 +3925,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1042 end_line: 1043 @@ -3944,7 +3944,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1051 end_line: 1052 @@ -3963,7 +3963,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1060 end_line: 1061 @@ -3982,7 +3982,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1068 end_line: 1069 @@ -4001,7 +4001,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1084 end_line: 1085 @@ -4020,7 +4020,7 @@ other_license_detections: license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1092 end_line: 1093 @@ -4035,7 +4035,7 @@ other_license_detections: This documentation is free; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 1095 end_line: 1099 @@ -4057,7 +4057,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1107 end_line: 1108 @@ -4076,7 +4076,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1114 end_line: 1115 @@ -4095,7 +4095,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 1126 end_line: 1128 @@ -4115,7 +4115,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1136 end_line: 1137 @@ -4134,7 +4134,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1144 end_line: 1147 @@ -4155,7 +4155,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-2.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later from_file: start_line: 1161 end_line: 1167 @@ -4179,7 +4179,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1181 end_line: 1185 @@ -4201,7 +4201,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 1192 end_line: 1193 @@ -4220,7 +4220,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1199 end_line: 1200 @@ -4239,7 +4239,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause AND (GPL-1.0-or-later OR Artistic-1.0-Perl) matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1209 end_line: 1209 @@ -4252,7 +4252,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1065.RULE matched_text: is licensed under the BSD-like license - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1210 end_line: 1211 @@ -4271,7 +4271,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1219 end_line: 1220 @@ -4290,7 +4290,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 1227 end_line: 1227 @@ -4307,7 +4307,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1237 end_line: 1238 @@ -4326,7 +4326,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1249 end_line: 1253 @@ -4348,7 +4348,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1263 end_line: 1264 @@ -4367,7 +4367,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1300 end_line: 1301 @@ -4386,7 +4386,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1309 end_line: 1310 @@ -4405,7 +4405,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1318 end_line: 1319 @@ -4424,7 +4424,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1326 end_line: 1327 @@ -4443,7 +4443,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1335 end_line: 1336 @@ -4463,7 +4463,7 @@ other_license_detections: Artistic-1.0-Perl) matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1344 end_line: 1345 @@ -4478,7 +4478,7 @@ other_license_detections: This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1347 end_line: 1348 @@ -4497,7 +4497,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1355 end_line: 1356 @@ -4516,7 +4516,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 1362 end_line: 1363 @@ -4535,7 +4535,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1371 end_line: 1372 @@ -4554,7 +4554,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1379 end_line: 1380 @@ -4573,7 +4573,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1387 end_line: 1388 @@ -4592,7 +4592,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1396 end_line: 1397 @@ -4607,7 +4607,7 @@ other_license_detections: This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1400 end_line: 1402 @@ -4627,7 +4627,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1408 end_line: 1408 @@ -4644,7 +4644,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1415 end_line: 1416 @@ -4663,7 +4663,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1422 end_line: 1422 @@ -4680,7 +4680,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1429 end_line: 1430 @@ -4699,7 +4699,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1437 end_line: 1437 @@ -4716,7 +4716,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1444 end_line: 1445 @@ -4735,7 +4735,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1455 end_line: 1456 @@ -4754,7 +4754,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1463 end_line: 1464 @@ -4773,7 +4773,7 @@ other_license_detections: license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND BSD-3-Clause matches: - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND bsd-new - spdx_license_expression: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND BSD-3-Clause + license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND BSD-3-Clause from_file: start_line: 1473 end_line: 1479 @@ -4797,7 +4797,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1502 end_line: 1503 @@ -4816,7 +4816,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1513 end_line: 1514 @@ -4835,7 +4835,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1522 end_line: 1523 @@ -4854,7 +4854,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1533 end_line: 1534 @@ -4873,7 +4873,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1543 end_line: 1544 @@ -4892,7 +4892,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1563 end_line: 1564 @@ -4911,7 +4911,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1573 end_line: 1575 @@ -4931,7 +4931,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1585 end_line: 1586 @@ -4950,7 +4950,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1593 end_line: 1594 @@ -4969,7 +4969,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1602 end_line: 1603 @@ -4988,7 +4988,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1612 end_line: 1613 @@ -5007,7 +5007,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1620 end_line: 1621 @@ -5026,7 +5026,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1628 end_line: 1629 @@ -5045,7 +5045,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1636 end_line: 1637 @@ -5064,7 +5064,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1644 end_line: 1646 @@ -5084,7 +5084,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1655 end_line: 1655 @@ -5102,7 +5102,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1662 end_line: 1663 @@ -5121,7 +5121,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1670 end_line: 1672 @@ -5141,7 +5141,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1679 end_line: 1680 @@ -5160,7 +5160,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0 matches: - license_expression: artistic-1.0 - spdx_license_expression: Artistic-1.0 + license_expression_spdx: Artistic-1.0 from_file: start_line: 1687 end_line: 1687 @@ -5177,7 +5177,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1707 end_line: 1708 @@ -5196,7 +5196,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1716 end_line: 1717 @@ -5211,7 +5211,7 @@ other_license_detections: As above, it is assumed that this file is licensed under the same terms as Perl itself. - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1725 end_line: 1726 @@ -5230,7 +5230,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1733 end_line: 1735 @@ -5250,7 +5250,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1742 end_line: 1743 @@ -5269,7 +5269,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1751 end_line: 1752 @@ -5288,7 +5288,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl matches: - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 1758 end_line: 1758 @@ -5305,7 +5305,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1764 end_line: 1765 @@ -5324,7 +5324,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1776 end_line: 1777 @@ -5343,7 +5343,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1787 end_line: 1788 @@ -5362,7 +5362,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1795 end_line: 1796 @@ -5381,7 +5381,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1814 end_line: 1814 @@ -5398,7 +5398,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1821 end_line: 1822 @@ -5417,7 +5417,7 @@ other_license_detections: license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1833 end_line: 1834 @@ -5432,7 +5432,7 @@ other_license_detections: This documentation is free; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 1836 end_line: 1840 @@ -5454,7 +5454,7 @@ other_license_detections: license_expression_spdx: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer matches: - license_expression: artistic-2.0 AND public-domain-disclaimer - spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 1849 end_line: 1851 @@ -5474,7 +5474,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1860 end_line: 1860 @@ -5491,7 +5491,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1869 end_line: 1869 @@ -5508,7 +5508,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1876 end_line: 1876 @@ -5525,7 +5525,7 @@ other_license_detections: license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1886 end_line: 1887 @@ -5540,7 +5540,7 @@ other_license_detections: This documentation is free; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 1889 end_line: 1893 @@ -5562,7 +5562,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: '1908' end_line: '1909' @@ -5581,7 +5581,7 @@ other_license_detections: license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: '1916' end_line: '1917' @@ -5596,7 +5596,7 @@ other_license_detections: This documentation is free; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: '1919' end_line: '1923' @@ -5618,7 +5618,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: '1933' end_line: '1933' @@ -5635,7 +5635,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: '1940' end_line: '1940' @@ -5652,7 +5652,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: '1947' end_line: '1947' @@ -5669,7 +5669,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: '1963' end_line: '1964' @@ -5688,7 +5688,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR artistic-dist-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR LicenseRef-scancode-artistic-1988-1.0 + license_expression_spdx: Artistic-1.0-Perl OR LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later from_file: start_line: '1985' @@ -5722,7 +5722,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 matches: - license_expression: artistic-dist-1.0 - spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0 + license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 from_file: start_line: 2014 end_line: 2016 @@ -5742,7 +5742,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later matches: - license_expression: artistic-dist-1.0 OR gpl-1.0-plus - spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later + license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later from_file: start_line: 2041 end_line: 2065 @@ -5784,7 +5784,7 @@ other_license_detections: license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND MIT matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 2072 end_line: 2079 @@ -5805,7 +5805,7 @@ other_license_detections: b) the "Artistic License" which comes with Perl. - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 2082 end_line: 2082 @@ -5822,7 +5822,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 2095 end_line: 2098 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pulseaudio/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pulseaudio/stable_copyright-detailed.expected.yml index cc982ea5ad..381b604215 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pulseaudio/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/pulseaudio/stable_copyright-detailed.expected.yml @@ -37,7 +37,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 17 end_line: 17 @@ -50,7 +50,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: LGPL-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 18 end_line: 33 @@ -79,7 +79,7 @@ license_detections: licensed. Since the PulseAudio daemon and the modules link to 'libpulsecore' they are of course also GPL licensed. - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 37 end_line: 38 @@ -98,7 +98,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-sun-source matches: - license_expression: sun-source - spdx_license_expression: LicenseRef-scancode-sun-source + license_expression_spdx: LicenseRef-scancode-sun-source from_file: start_line: 44 end_line: 62 @@ -134,7 +134,7 @@ license_detections: license_expression_spdx: HPND-Pbmplus matches: - license_expression: hpnd-pbmplus - spdx_license_expression: HPND-Pbmplus + license_expression_spdx: HPND-Pbmplus from_file: start_line: 68 end_line: 73 @@ -157,7 +157,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 79 end_line: 81 @@ -177,7 +177,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 87 end_line: 89 @@ -197,7 +197,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 94 end_line: 96 @@ -217,7 +217,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 102 end_line: 104 @@ -237,7 +237,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 111 end_line: 113 @@ -257,7 +257,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 120 end_line: 122 @@ -277,7 +277,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 128 end_line: 130 @@ -297,7 +297,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 137 end_line: 139 @@ -317,7 +317,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 144 end_line: 146 @@ -337,7 +337,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-adrian matches: - license_expression: adrian - spdx_license_expression: LicenseRef-scancode-adrian + license_expression_spdx: LicenseRef-scancode-adrian from_file: start_line: 152 end_line: 159 @@ -362,7 +362,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 164 end_line: 166 @@ -382,7 +382,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 171 end_line: 173 @@ -402,7 +402,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 179 end_line: 181 @@ -422,7 +422,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 187 end_line: 189 @@ -442,7 +442,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: '195' end_line: '197' @@ -462,7 +462,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 203 end_line: 205 @@ -482,7 +482,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 211 end_line: 213 @@ -502,7 +502,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 219 end_line: 221 @@ -522,7 +522,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 226 end_line: 228 @@ -542,7 +542,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 235 end_line: 237 @@ -562,7 +562,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 243 end_line: 245 @@ -582,7 +582,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 251 end_line: 253 @@ -602,7 +602,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 259 end_line: 261 @@ -622,7 +622,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 266 end_line: 268 @@ -642,7 +642,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 275 end_line: 277 @@ -662,7 +662,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 283 end_line: 285 @@ -682,7 +682,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 291 end_line: 293 @@ -702,7 +702,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 299 end_line: 317 @@ -738,7 +738,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 323 end_line: 325 @@ -758,7 +758,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 332 end_line: 334 @@ -778,7 +778,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 340 end_line: 342 @@ -798,7 +798,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 347 end_line: 349 @@ -818,7 +818,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 354 end_line: 356 @@ -838,7 +838,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 363 end_line: 365 @@ -858,7 +858,7 @@ license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 371 end_line: 373 @@ -878,7 +878,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 382 end_line: 384 @@ -898,7 +898,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 389 end_line: 391 @@ -918,7 +918,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 397 end_line: 399 @@ -938,7 +938,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 405 end_line: 407 @@ -958,7 +958,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 413 end_line: 415 @@ -978,7 +978,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 422 end_line: 424 @@ -998,7 +998,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 430 end_line: 432 @@ -1018,7 +1018,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 440 end_line: 442 @@ -1038,7 +1038,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 447 end_line: 449 @@ -1058,7 +1058,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 454 end_line: 456 @@ -1078,7 +1078,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 465 end_line: 467 @@ -1098,7 +1098,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 472 end_line: 474 @@ -1118,7 +1118,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 479 end_line: 481 @@ -1138,7 +1138,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 487 end_line: 489 @@ -1158,7 +1158,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 495 end_line: 497 @@ -1178,7 +1178,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 502 end_line: 504 @@ -1198,7 +1198,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 511 end_line: 513 @@ -1218,7 +1218,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 518 end_line: 520 @@ -1238,7 +1238,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 525 end_line: 527 @@ -1258,7 +1258,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 533 end_line: 535 @@ -1278,7 +1278,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 540 end_line: 542 @@ -1298,7 +1298,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 547 end_line: 549 @@ -1318,7 +1318,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 554 end_line: 556 @@ -1338,7 +1338,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 561 end_line: 563 @@ -1358,7 +1358,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 568 end_line: 570 @@ -1378,7 +1378,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 576 end_line: 578 @@ -1398,7 +1398,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 585 end_line: 587 @@ -1418,7 +1418,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 594 end_line: 596 @@ -1438,7 +1438,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 602 end_line: 604 @@ -1454,7 +1454,7 @@ license_detections: On Debian systems, the complete text of the LGPL-2.1 can be found in /usr/share/common-licenses/LGPL-2.1. - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 608 end_line: 610 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/python-django/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/python-django/stable_copyright-detailed.expected.yml index 57a4b1e2e2..4870655b6f 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/python-django/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/p/python-django/stable_copyright-detailed.expected.yml @@ -35,7 +35,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 84 end_line: 84 @@ -48,7 +48,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 85 end_line: 95 @@ -72,7 +72,7 @@ other_license_detections: See the License for the specific language governing permissions and limitations under the License. - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 97 end_line: 98 @@ -91,7 +91,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 101 end_line: 118 @@ -126,7 +126,7 @@ other_license_detections: license_expression_spdx: PSF-2.0 matches: - license_expression: psf-2.0 - spdx_license_expression: PSF-2.0 + license_expression_spdx: PSF-2.0 from_file: start_line: 121 end_line: 169 @@ -192,7 +192,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 172 end_line: '191' @@ -229,7 +229,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: '194' end_line: 217 @@ -270,7 +270,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 76 end_line: 76 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/r/reportbug/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/r/reportbug/stable_copyright-detailed.expected.yml index e1f186fa3a..3b9796df45 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/r/reportbug/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/r/reportbug/stable_copyright-detailed.expected.yml @@ -9,7 +9,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-reportbug matches: - license_expression: reportbug - spdx_license_expression: LicenseRef-scancode-reportbug + license_expression_spdx: LicenseRef-scancode-reportbug from_file: start_line: 10 end_line: 25 @@ -42,7 +42,7 @@ license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 32 end_line: 37 @@ -65,7 +65,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-reportbug AND GPL-2.0-only matches: - license_expression: reportbug - spdx_license_expression: LicenseRef-scancode-reportbug + license_expression_spdx: LicenseRef-scancode-reportbug from_file: start_line: 43 end_line: 58 @@ -94,7 +94,7 @@ license_detections: ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ## SOFTWARE. - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 61 end_line: 61 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/r/ruby-airbrussh/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/r/ruby-airbrussh/stable_copyright-detailed.expected.yml index eb3c6067e3..150004dbbd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/r/ruby-airbrussh/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/r/ruby-airbrussh/stable_copyright-detailed.expected.yml @@ -12,7 +12,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 14 end_line: 31 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/sendmail/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/sendmail/stable_copyright-detailed.expected.yml index 67bf644469..3f062b2e4d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/sendmail/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/sendmail/stable_copyright-detailed.expected.yml @@ -12,7 +12,7 @@ other_license_detections: license_expression_spdx: Sendmail matches: - license_expression: sendmail - spdx_license_expression: Sendmail + license_expression_spdx: Sendmail from_file: start_line: '19' end_line: 99 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/slirp4netns/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/slirp4netns/stable_copyright-detailed.expected.yml index 9e7ef8704f..76fd20db45 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/slirp4netns/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/slirp4netns/stable_copyright-detailed.expected.yml @@ -36,7 +36,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 21 end_line: 21 @@ -53,7 +53,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 79 end_line: 101 @@ -93,7 +93,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 106 end_line: 124 @@ -129,7 +129,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 127 end_line: 143 @@ -163,7 +163,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 145 end_line: 145 @@ -176,7 +176,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 148 end_line: 150 @@ -192,7 +192,7 @@ other_license_detections: The GNU General Public License, Version 2, - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 152 end_line: 156 @@ -214,7 +214,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 158 end_line: 158 @@ -227,7 +227,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 159 end_line: 173 @@ -259,7 +259,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.1-only matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 175 end_line: 175 @@ -272,7 +272,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 176 end_line: 187 @@ -297,7 +297,7 @@ other_license_detections: You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 189 end_line: '190' diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/subversion/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/subversion/stable_copyright-detailed.expected.yml index e6c489cdfc..086f2b2f86 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/subversion/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/subversion/stable_copyright-detailed.expected.yml @@ -35,7 +35,7 @@ other_license_detections: license_expression_spdx: HPND-Markus-Kuhn matches: - license_expression: markus-kuhn-license - spdx_license_expression: HPND-Markus-Kuhn + license_expression_spdx: HPND-Markus-Kuhn from_file: start_line: 21 end_line: 23 @@ -55,7 +55,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 33 end_line: 34 @@ -74,7 +74,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 78 end_line: 78 @@ -87,7 +87,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 79 end_line: 80 @@ -106,7 +106,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-only matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 82 end_line: 82 @@ -119,7 +119,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 83 end_line: 84 @@ -138,7 +138,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 86 end_line: 86 @@ -151,7 +151,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 87 end_line: 102 @@ -184,7 +184,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 107 end_line: 131 @@ -226,7 +226,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 136 end_line: 155 @@ -263,7 +263,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 158 end_line: 174 @@ -297,7 +297,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 177 end_line: 208 @@ -346,7 +346,7 @@ other_license_detections: license_expression_spdx: AFL-3.0 matches: - license_expression: afl-3.0 - spdx_license_expression: AFL-3.0 + license_expression_spdx: AFL-3.0 from_file: start_line: 211 end_line: 396 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/systemd/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/systemd/stable_copyright-detailed.expected.yml index d029766f5e..87b6751340 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/systemd/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/s/systemd/stable_copyright-detailed.expected.yml @@ -32,7 +32,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer matches: - license_expression: public-domain-disclaimer - spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 62 end_line: 63 @@ -51,7 +51,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 114 end_line: 130 @@ -85,7 +85,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 132 end_line: 132 @@ -98,7 +98,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 133 end_line: 148 @@ -131,7 +131,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 150 end_line: 150 @@ -144,7 +144,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 151 end_line: 166 @@ -177,7 +177,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 168 end_line: 168 @@ -190,7 +190,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 169 end_line: 184 @@ -223,7 +223,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 186 end_line: 186 @@ -236,7 +236,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE matched_text: 'License: cc0-1.0' - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 187 end_line: '195' diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/t/tzdata/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/t/tzdata/stable_copyright-detailed.expected.yml index 1b9ba023db..d56ea21036 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/t/tzdata/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/t/tzdata/stable_copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 9 end_line: 9 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/u/unzip/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/u/unzip/stable_copyright-detailed.expected.yml index 2a8432a85d..7d9b4fc751 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/u/unzip/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/u/unzip/stable_copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-info-zip-2009-01 matches: - license_expression: info-zip-2009-01 - spdx_license_expression: LicenseRef-scancode-info-zip-2009-01 + license_expression_spdx: LicenseRef-scancode-info-zip-2009-01 from_file: start_line: 15 end_line: 76 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/w/webkit2gtk/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/w/webkit2gtk/stable_copyright-detailed.expected.yml index 20665d3e91..9825f71c21 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/w/webkit2gtk/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/w/webkit2gtk/stable_copyright-detailed.expected.yml @@ -47,7 +47,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 1015 end_line: 1017 @@ -67,7 +67,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1045 end_line: 1064 @@ -104,7 +104,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1067 end_line: 1091 @@ -146,7 +146,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 1094 end_line: 1112 @@ -182,7 +182,7 @@ other_license_detections: license_expression_spdx: BSL-1.0 matches: - license_expression: boost-1.0 - spdx_license_expression: BSL-1.0 + license_expression_spdx: BSL-1.0 from_file: start_line: 1115 end_line: 1138 @@ -223,7 +223,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-only AND LGPL-2.0-or-later matches: - license_expression: lgpl-2.0 - spdx_license_expression: LGPL-2.0-only + license_expression_spdx: LGPL-2.0-only from_file: start_line: 1140 end_line: 1140 @@ -236,7 +236,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_12.RULE matched_text: 'License: lgpl-2' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 1141 end_line: 1150 @@ -263,7 +263,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 1152 end_line: 1152 @@ -276,7 +276,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 1153 end_line: 1163 @@ -304,7 +304,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 1165 end_line: 1165 @@ -317,7 +317,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 1166 end_line: 1175 @@ -344,7 +344,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 1177 end_line: 1177 @@ -357,7 +357,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 1178 end_line: 1188 @@ -385,7 +385,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 1190 end_line: 1190 @@ -398,7 +398,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 1191 end_line: 1201 @@ -426,7 +426,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1203 end_line: 1203 @@ -439,7 +439,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1204 end_line: 1215 @@ -468,7 +468,7 @@ other_license_detections: license_expression_spdx: ICU matches: - license_expression: x11 - spdx_license_expression: ICU + license_expression_spdx: ICU from_file: start_line: 1218 end_line: 1241 @@ -509,7 +509,7 @@ other_license_detections: license_expression_spdx: MPL-1.1 matches: - license_expression: mpl-1.1 - spdx_license_expression: MPL-1.1 + license_expression_spdx: MPL-1.1 from_file: start_line: 1243 end_line: 1243 @@ -522,7 +522,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mpl-1.1_24.RULE matched_text: 'License: mpl-1.1' - license_expression: mpl-1.1 - spdx_license_expression: MPL-1.1 + license_expression_spdx: MPL-1.1 from_file: start_line: 1244 end_line: 1710 @@ -1006,7 +1006,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 1712 end_line: 1712 @@ -1019,7 +1019,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 1713 end_line: 1714 @@ -1038,7 +1038,7 @@ other_license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 1717 end_line: 1729 @@ -1068,7 +1068,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 9 end_line: 9 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/w/win32-loader/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/w/win32-loader/stable_copyright-detailed.expected.yml index c76bb14872..84cdcbeb33 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/w/win32-loader/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/w/win32-loader/stable_copyright-detailed.expected.yml @@ -10,7 +10,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 9 end_line: 9 @@ -23,7 +23,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 10 end_line: 24 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/x/xymon/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/x/xymon/stable_copyright-detailed.expected.yml index cf1333fcb1..51fc07558a 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/x/xymon/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/x/xymon/stable_copyright-detailed.expected.yml @@ -32,7 +32,7 @@ other_license_detections: license_expression_spdx: SSLeay-standalone matches: - license_expression: ssleay-windows - spdx_license_expression: SSLeay-standalone + license_expression_spdx: SSLeay-standalone from_file: start_line: 43 end_line: 100 @@ -107,7 +107,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 105 end_line: 105 @@ -124,7 +124,7 @@ other_license_detections: license_expression_spdx: NTP matches: - license_expression: mit-old-style-no-advert - spdx_license_expression: NTP + license_expression_spdx: NTP from_file: start_line: 116 end_line: 126 @@ -152,7 +152,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only WITH x11vnc-openssl-exception matches: - license_expression: gpl-2.0 WITH openssl-exception-gpl-2.0 - spdx_license_expression: GPL-2.0-only WITH x11vnc-openssl-exception + license_expression_spdx: GPL-2.0-only WITH x11vnc-openssl-exception from_file: start_line: 129 end_line: 135 @@ -176,7 +176,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 137 end_line: 137 @@ -189,7 +189,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 138 end_line: 143 @@ -212,7 +212,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 145 end_line: 145 @@ -225,7 +225,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 146 end_line: 152 @@ -249,7 +249,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 154 end_line: 154 @@ -262,7 +262,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl_72.RULE matched_text: 'License: gpl' - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 155 end_line: 159 @@ -284,7 +284,7 @@ other_license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 163 end_line: 179 @@ -318,7 +318,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 182 end_line: 207 @@ -361,7 +361,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later AND Zlib matches: - license_expression: gpl-1.0-plus AND zlib - spdx_license_expression: GPL-1.0-or-later AND Zlib + license_expression_spdx: GPL-1.0-or-later AND Zlib from_file: start_line: 35 end_line: 36 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/z/z3/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/z/z3/stable_copyright-detailed.expected.yml index 2cb40b5095..86d6ca52d3 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/z/z3/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/z/z3/stable_copyright-detailed.expected.yml @@ -11,7 +11,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 8 end_line: 24 @@ -45,7 +45,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 29 end_line: 29 @@ -58,7 +58,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 30 end_line: 44 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-adi.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-adi.copyright-detailed.expected.yml index daaded87d2..9b0003d93d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-adi.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-adi.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 6 end_line: 20 @@ -36,7 +36,7 @@ license_detections: along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 22 end_line: 23 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-amd-graphics.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-amd-graphics.copyright-detailed.expected.yml index 2e77c23215..eacd51738a 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-amd-graphics.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-amd-graphics.copyright-detailed.expected.yml @@ -10,7 +10,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 14 end_line: 31 @@ -45,7 +45,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-amd-linux-firmware matches: - license_expression: amd-linux-firmware - spdx_license_expression: LicenseRef-scancode-amd-linux-firmware + license_expression_spdx: LicenseRef-scancode-amd-linux-firmware from_file: start_line: 38 end_line: 86 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-atheros.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-atheros.copyright-detailed.expected.yml index a505e57eb5..a68886c6ba 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-atheros.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-atheros.copyright-detailed.expected.yml @@ -19,7 +19,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-stmicro-linux-firmware matches: - license_expression: stmicroelectronics-linux-firmware - spdx_license_expression: LicenseRef-scancode-stmicro-linux-firmware + license_expression_spdx: LicenseRef-scancode-stmicro-linux-firmware from_file: start_line: 12 end_line: 46 @@ -73,7 +73,7 @@ license_detections: GPL-2.0-or-later WITH eCos-exception-2.0 AND MIT matches: - license_expression: clear-bsd - spdx_license_expression: BSD-3-Clause-Clear + license_expression_spdx: BSD-3-Clause-Clear from_file: start_line: 57 end_line: 85 @@ -115,7 +115,7 @@ license_detections: OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 87 end_line: 97 @@ -139,7 +139,7 @@ license_detections: ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - license_expression: bsd-no-mod - spdx_license_expression: LicenseRef-scancode-bsd-no-mod + license_expression_spdx: LicenseRef-scancode-bsd-no-mod from_file: start_line: 99 end_line: 128 @@ -182,7 +182,7 @@ license_detections: OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - license_expression: gpl-2.0-plus WITH ecos-exception-2.0 - spdx_license_expression: GPL-2.0-or-later WITH eCos-exception-2.0 + license_expression_spdx: GPL-2.0-or-later WITH eCos-exception-2.0 from_file: start_line: 130 end_line: 142 @@ -208,7 +208,7 @@ license_detections: This exception does not invalidate any other reasons why a work based on this file might be covered by the GNU General Public License. - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 144 end_line: 161 @@ -243,7 +243,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-qca-linux-firmware matches: - license_expression: qca-linux-firmware - spdx_license_expression: LicenseRef-scancode-qca-linux-firmware + license_expression_spdx: LicenseRef-scancode-qca-linux-firmware from_file: start_line: 205 end_line: 248 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-bnx2.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-bnx2.copyright-detailed.expected.yml index 01794b76c2..6561d4f722 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-bnx2.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-bnx2.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 4 end_line: 9 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-bnx2x.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-bnx2x.copyright-detailed.expected.yml index 310294251f..994342d198 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-bnx2x.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-bnx2x.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 6 end_line: 11 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-brcm80211.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-brcm80211.copyright-detailed.expected.yml index 8c3745f554..de178a446c 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-brcm80211.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-brcm80211.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-broadcom-proprietary matches: - license_expression: broadcom-proprietary - spdx_license_expression: LicenseRef-scancode-broadcom-proprietary + license_expression_spdx: LicenseRef-scancode-broadcom-proprietary from_file: start_line: 4 end_line: 207 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-cavium.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-cavium.copyright-detailed.expected.yml index 2bb4887b8b..67e04d8bdb 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-cavium.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-cavium.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-cavium-linux-firmware matches: - license_expression: cavium-linux-firmware - spdx_license_expression: LicenseRef-scancode-cavium-linux-firmware + license_expression_spdx: LicenseRef-scancode-cavium-linux-firmware from_file: start_line: 6 end_line: 62 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intel-sound.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intel-sound.copyright-detailed.expected.yml index 4ad8de09a1..c096d59372 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intel-sound.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intel-sound.copyright-detailed.expected.yml @@ -19,7 +19,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-intel matches: - license_expression: intel - spdx_license_expression: LicenseRef-scancode-intel + license_expression_spdx: LicenseRef-scancode-intel from_file: start_line: 11 end_line: 46 @@ -72,7 +72,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-intel matches: - license_expression: intel - spdx_license_expression: LicenseRef-scancode-intel + license_expression_spdx: LicenseRef-scancode-intel from_file: start_line: 53 end_line: 87 @@ -130,7 +130,7 @@ license_detections: AND HPND-Intel matches: - license_expression: intel - spdx_license_expression: LicenseRef-scancode-intel + license_expression_spdx: LicenseRef-scancode-intel from_file: start_line: 101 end_line: 135 @@ -178,7 +178,7 @@ license_detections: ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-new AND other-permissive AND other-copyleft - spdx_license_expression: BSD-3-Clause AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft + license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft from_file: start_line: 139 end_line: 143 @@ -196,7 +196,7 @@ license_detections: file. Unless otherwise noted in the body of the source file(s), the following copyright notices will apply to the contents of the newlib subdirectory: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 149 end_line: 158 @@ -219,7 +219,7 @@ license_detections: the BSD License and may only be used or replicated with the express permission of Red Hat, Inc. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 165 end_line: 186 @@ -254,7 +254,7 @@ license_detections: ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: x11-lucent - spdx_license_expression: dtoa + license_expression_spdx: dtoa from_file: start_line: '194' end_line: 203 @@ -277,7 +277,7 @@ license_detections: REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. - license_expression: standard-ml-nj - spdx_license_expression: SMLNJ + license_expression_spdx: SMLNJ from_file: start_line: 212 end_line: 229 @@ -308,7 +308,7 @@ license_detections: ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - license_expression: amd-historical - spdx_license_expression: AMD-newlib + license_expression_spdx: AMD-newlib from_file: start_line: 236 end_line: 247 @@ -333,7 +333,7 @@ license_detections: So that all may benefit from your experience, please report any problems or suggestions about this software - license_expression: sunpro - spdx_license_expression: SunPro + license_expression_spdx: SunPro from_file: start_line: 266 end_line: 268 @@ -349,7 +349,7 @@ license_detections: Permission to use, copy, modify, and distribute this software is freely granted, provided that this notice is preserved. - license_expression: hp-1986 - spdx_license_expression: HP-1986 + license_expression_spdx: HP-1986 from_file: start_line: 274 end_line: 283 @@ -372,7 +372,7 @@ license_detections: Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. - license_expression: nilsson-historical - spdx_license_expression: LicenseRef-scancode-nilsson-historical + license_expression_spdx: LicenseRef-scancode-nilsson-historical from_file: start_line: 289 end_line: 296 @@ -393,7 +393,7 @@ license_detections: WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - license_expression: newlib-historical - spdx_license_expression: LicenseRef-scancode-newlib-historical + license_expression_spdx: LicenseRef-scancode-newlib-historical from_file: start_line: 302 end_line: 310 @@ -415,7 +415,7 @@ license_detections: the new terms are clearly indicated on the first page of each file where they apply. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 317 end_line: 337 @@ -449,7 +449,7 @@ license_detections: (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: amd-historical - spdx_license_expression: AMD-newlib + license_expression_spdx: AMD-newlib from_file: start_line: 343 end_line: 354 @@ -474,7 +474,7 @@ license_detections: So that all may benefit from your experience, please report any problems or suggestions about this software to the - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 369 end_line: 394 @@ -513,7 +513,7 @@ license_detections: OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 401 end_line: 420 @@ -546,7 +546,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 427 end_line: 446 @@ -579,7 +579,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 453 end_line: 472 @@ -612,7 +612,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: x11-hanson - spdx_license_expression: LicenseRef-scancode-x11-hanson + license_expression_spdx: LicenseRef-scancode-x11-hanson from_file: start_line: 480 end_line: 489 @@ -635,7 +635,7 @@ license_detections: OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 496 end_line: 515 @@ -668,7 +668,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 522 end_line: 542 @@ -702,7 +702,7 @@ license_detections: OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: delorie-historical - spdx_license_expression: LicenseRef-scancode-delorie-historical + license_expression_spdx: LicenseRef-scancode-delorie-historical from_file: start_line: 548 end_line: 553 @@ -721,7 +721,7 @@ license_detections: This file is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - license_expression: intel-osl-1993 - spdx_license_expression: HPND-Intel + license_expression_spdx: HPND-Intel from_file: start_line: 563 end_line: 585 @@ -757,7 +757,7 @@ license_detections: OF ANY KIND. IN NO EVENT SHALL INTEL'S TOTAL LIABILITY EXCEED THE SUM PAID TO INTEL FOR THE PRODUCT LICENSED HEREUNDER. - license_expression: hp-1986 - spdx_license_expression: HP-1986 + license_expression_spdx: HP-1986 from_file: start_line: 591 end_line: 600 @@ -780,7 +780,7 @@ license_detections: Hewlett-Packard Company makes no representations about the suitability of this software for any purpose. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 609 end_line: 628 @@ -813,7 +813,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 635 end_line: 654 @@ -846,7 +846,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 663 end_line: 682 @@ -879,7 +879,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 693 end_line: 715 @@ -915,7 +915,7 @@ license_detections: ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 723 end_line: 742 @@ -948,7 +948,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 749 end_line: 768 @@ -981,7 +981,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 775 end_line: 794 @@ -1014,7 +1014,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 801 end_line: 820 @@ -1047,7 +1047,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 827 end_line: 846 @@ -1080,7 +1080,7 @@ license_detections: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 854 end_line: 875 @@ -1115,7 +1115,7 @@ license_detections: NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 881 end_line: 906 @@ -1154,7 +1154,7 @@ license_detections: NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 914 end_line: 941 @@ -1195,7 +1195,7 @@ license_detections: (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: newlib-historical - spdx_license_expression: LicenseRef-scancode-newlib-historical + license_expression_spdx: LicenseRef-scancode-newlib-historical from_file: start_line: 947 end_line: 955 @@ -1217,7 +1217,7 @@ license_detections: the new terms are clearly indicated on the first page of each file where they apply. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 962 end_line: 982 @@ -1251,7 +1251,7 @@ license_detections: OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 989 end_line: 1012 @@ -1288,7 +1288,7 @@ license_detections: TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1019 end_line: 1038 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intelwimax.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intelwimax.copyright-detailed.expected.yml index 378497f441..e187ffda14 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intelwimax.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-intelwimax.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-intel matches: - license_expression: intel - spdx_license_expression: LicenseRef-scancode-intel + license_expression_spdx: LicenseRef-scancode-intel from_file: start_line: 8 end_line: 46 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ipw2x00.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ipw2x00.copyright-detailed.expected.yml index 2ad1a5ef4b..54c81120c4 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ipw2x00.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ipw2x00.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 7 end_line: 332 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ivtv.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ivtv.copyright-detailed.expected.yml index 1db6a6ce74..55bdb5e42d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ivtv.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ivtv.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-hauppauge-firmware-oem matches: - license_expression: hauppauge-firmware-oem - spdx_license_expression: LicenseRef-scancode-hauppauge-firmware-oem + license_expression_spdx: LicenseRef-scancode-hauppauge-firmware-oem from_file: start_line: 6 end_line: 154 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-iwlwifi.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-iwlwifi.copyright-detailed.expected.yml index f0f99a1ea9..faf3af4d06 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-iwlwifi.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-iwlwifi.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-intel matches: - license_expression: intel - spdx_license_expression: LicenseRef-scancode-intel + license_expression_spdx: LicenseRef-scancode-intel from_file: start_line: 7 end_line: 42 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-libertas.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-libertas.copyright-detailed.expected.yml index 3c1e0d03bd..1dd9125ffe 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-libertas.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-libertas.copyright-detailed.expected.yml @@ -10,7 +10,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 11 end_line: 48 @@ -65,7 +65,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-marvell-firmware matches: - license_expression: marvell-firmware - spdx_license_expression: LicenseRef-scancode-marvell-firmware + license_expression_spdx: LicenseRef-scancode-marvell-firmware from_file: start_line: 55 end_line: 84 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-linux-nonfree.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-linux-nonfree.copyright-detailed.expected.yml index daaded87d2..9b0003d93d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-linux-nonfree.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-linux-nonfree.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 6 end_line: 20 @@ -36,7 +36,7 @@ license_detections: along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 22 end_line: 23 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-linux.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-linux.copyright-detailed.expected.yml index daaded87d2..9b0003d93d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-linux.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-linux.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 6 end_line: 20 @@ -36,7 +36,7 @@ license_detections: along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 22 end_line: 23 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-misc-nonfree.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-misc-nonfree.copyright-detailed.expected.yml index b2f2ae6bbb..d1d42c13a3 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-misc-nonfree.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-misc-nonfree.copyright-detailed.expected.yml @@ -59,7 +59,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-3com-microcode matches: - license_expression: 3com-microcode - spdx_license_expression: LicenseRef-scancode-3com-microcode + license_expression_spdx: LicenseRef-scancode-3com-microcode from_file: start_line: 11 end_line: 38 @@ -104,7 +104,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-bsd-simplified-source matches: - license_expression: bsd-simplified-source - spdx_license_expression: LicenseRef-scancode-bsd-simplified-source + license_expression_spdx: LicenseRef-scancode-bsd-simplified-source from_file: start_line: 46 end_line: 49 @@ -125,7 +125,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-agere-bsd matches: - license_expression: agere-bsd - spdx_license_expression: LicenseRef-scancode-agere-bsd + license_expression_spdx: LicenseRef-scancode-agere-bsd from_file: start_line: 56 end_line: 92 @@ -179,7 +179,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-x11-acer matches: - license_expression: x11-acer - spdx_license_expression: LicenseRef-scancode-x11-acer + license_expression_spdx: LicenseRef-scancode-x11-acer from_file: start_line: 97 end_line: 109 @@ -209,7 +209,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ctl-linux-firmware matches: - license_expression: ctl-linux-firmware - spdx_license_expression: LicenseRef-scancode-ctl-linux-firmware + license_expression_spdx: LicenseRef-scancode-ctl-linux-firmware from_file: start_line: 116 end_line: 159 @@ -270,7 +270,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 164 end_line: 166 @@ -290,7 +290,7 @@ license_detections: license_expression_spdx: Linux-OpenIB matches: - license_expression: linux-openib - spdx_license_expression: Linux-OpenIB + license_expression_spdx: Linux-OpenIB from_file: start_line: 173 end_line: '193' @@ -328,7 +328,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 200 end_line: 223 @@ -369,7 +369,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-bsd-simplified-source matches: - license_expression: bsd-simplified-source - spdx_license_expression: LicenseRef-scancode-bsd-simplified-source + license_expression_spdx: LicenseRef-scancode-bsd-simplified-source from_file: start_line: 228 end_line: 231 @@ -390,7 +390,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 236 end_line: 247 @@ -419,7 +419,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 252 end_line: 264 @@ -449,7 +449,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 269 end_line: 281 @@ -479,7 +479,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 286 end_line: 293 @@ -504,7 +504,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 300 end_line: 323 @@ -545,7 +545,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 328 end_line: 339 @@ -574,7 +574,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 344 end_line: 350 @@ -598,7 +598,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 355 end_line: 363 @@ -624,7 +624,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-intel matches: - license_expression: intel - spdx_license_expression: LicenseRef-scancode-intel + license_expression_spdx: LicenseRef-scancode-intel from_file: start_line: 370 end_line: 403 @@ -675,7 +675,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-nxp-firmware-patent matches: - license_expression: nxp-firmware-patent - spdx_license_expression: LicenseRef-scancode-nxp-firmware-patent + license_expression_spdx: LicenseRef-scancode-nxp-firmware-patent from_file: start_line: 414 end_line: 457 @@ -736,7 +736,7 @@ license_detections: license_expression_spdx: BSD-4-Clause matches: - license_expression: bsd-original - spdx_license_expression: BSD-4-Clause + license_expression_spdx: BSD-4-Clause from_file: start_line: 462 end_line: 487 @@ -779,7 +779,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 494 end_line: 510 @@ -813,7 +813,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-moxa-linux-firmware matches: - license_expression: moxa-linux-firmware - spdx_license_expression: LicenseRef-scancode-moxa-linux-firmware + license_expression_spdx: LicenseRef-scancode-moxa-linux-firmware from_file: start_line: 515 end_line: 530 @@ -846,7 +846,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ralink-firmware matches: - license_expression: ralink-firmware - spdx_license_expression: LicenseRef-scancode-ralink-firmware + license_expression_spdx: LicenseRef-scancode-ralink-firmware from_file: start_line: 537 end_line: 572 @@ -899,7 +899,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 577 end_line: 577 @@ -916,7 +916,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 582 end_line: 708 @@ -1060,7 +1060,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 719 end_line: 756 @@ -1115,7 +1115,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 761 end_line: 768 @@ -1140,7 +1140,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ralink-firmware matches: - license_expression: ralink-firmware - spdx_license_expression: LicenseRef-scancode-ralink-firmware + license_expression_spdx: LicenseRef-scancode-ralink-firmware from_file: start_line: 775 end_line: 810 @@ -1193,7 +1193,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 815 end_line: 817 @@ -1213,7 +1213,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 822 end_line: 824 @@ -1233,7 +1233,7 @@ license_detections: license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-proprietary-license matches: - license_expression: bsd-new AND proprietary-license - spdx_license_expression: BSD-3-Clause AND LicenseRef-scancode-proprietary-license + license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-proprietary-license from_file: start_line: 829 end_line: 861 @@ -1283,7 +1283,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 865 end_line: 871 @@ -1307,7 +1307,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-intel matches: - license_expression: intel - spdx_license_expression: LicenseRef-scancode-intel + license_expression_spdx: LicenseRef-scancode-intel from_file: start_line: 876 end_line: 911 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-myricom.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-myricom.copyright-detailed.expected.yml index 290f4c8ba5..dcd92f2552 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-myricom.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-myricom.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: BSD-Source-Code matches: - license_expression: bsd-source-code - spdx_license_expression: BSD-Source-Code + license_expression_spdx: BSD-Source-Code from_file: start_line: 7 end_line: 27 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-netronome.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-netronome.copyright-detailed.expected.yml index 4195aecdd0..d05c7cfb15 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-netronome.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-netronome.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-netronome-firmware matches: - license_expression: netronome-firmware - spdx_license_expression: LicenseRef-scancode-netronome-firmware + license_expression_spdx: LicenseRef-scancode-netronome-firmware from_file: start_line: 6 end_line: 68 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-netxen.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-netxen.copyright-detailed.expected.yml index 796442203c..51cf8093b1 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-netxen.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-netxen.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-qlogic-firmware matches: - license_expression: qlogic-firmware - spdx_license_expression: LicenseRef-scancode-qlogic-firmware + license_expression_spdx: LicenseRef-scancode-qlogic-firmware from_file: start_line: 7 end_line: 34 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qcom-media.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qcom-media.copyright-detailed.expected.yml index ab25f72d35..cf528237de 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qcom-media.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qcom-media.copyright-detailed.expected.yml @@ -17,7 +17,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-qti-linux-firmware matches: - license_expression: qti-linux-firmware - spdx_license_expression: LicenseRef-scancode-qti-linux-firmware + license_expression_spdx: LicenseRef-scancode-qti-linux-firmware from_file: start_line: 6 end_line: 211 @@ -240,7 +240,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 231 end_line: 234 @@ -261,7 +261,7 @@ license_detections: license_expression_spdx: OpenSSL matches: - license_expression: openssl-ssleay - spdx_license_expression: OpenSSL + license_expression_spdx: OpenSSL from_file: start_line: 240 end_line: 244 @@ -279,7 +279,7 @@ license_detections: Open Source licenses. In case of any license issues related to OpenSSL please contact openssl-core@openssl.org. - license_expression: openssl-ssleay - spdx_license_expression: OpenSSL + license_expression_spdx: OpenSSL from_file: start_line: 246 end_line: 246 @@ -296,7 +296,7 @@ license_detections: license_expression_spdx: OpenSSL-standalone matches: - license_expression: openssl - spdx_license_expression: OpenSSL-standalone + license_expression_spdx: OpenSSL-standalone from_file: start_line: 252 end_line: 299 @@ -361,7 +361,7 @@ license_detections: license_expression_spdx: SSLeay-standalone matches: - license_expression: ssleay-windows - spdx_license_expression: SSLeay-standalone + license_expression_spdx: SSLeay-standalone from_file: start_line: 309 end_line: 360 @@ -430,7 +430,7 @@ license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 371 end_line: 371 @@ -447,7 +447,7 @@ license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 380 end_line: 396 @@ -481,7 +481,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 413 end_line: 415 @@ -501,7 +501,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 439 end_line: 461 @@ -541,7 +541,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-gary-s-brown matches: - license_expression: gary-s-brown - spdx_license_expression: LicenseRef-scancode-gary-s-brown + license_expression_spdx: LicenseRef-scancode-gary-s-brown from_file: start_line: 469 end_line: 470 @@ -560,7 +560,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 514 end_line: 519 @@ -583,7 +583,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer matches: - license_expression: public-domain-disclaimer - spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 531 end_line: 539 @@ -609,7 +609,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer matches: - license_expression: public-domain-disclaimer - spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 549 end_line: 564 @@ -642,7 +642,7 @@ license_detections: license_expression_spdx: GPL-2.0-only OR BSD-3-Clause matches: - license_expression: gpl-2.0 OR bsd-new - spdx_license_expression: GPL-2.0-only OR BSD-3-Clause + license_expression_spdx: GPL-2.0-only OR BSD-3-Clause from_file: start_line: 580 end_line: 587 @@ -667,7 +667,7 @@ license_detections: license_expression_spdx: GPL-2.0-only OR BSD-3-Clause matches: - license_expression: gpl-2.0 OR bsd-new - spdx_license_expression: GPL-2.0-only OR BSD-3-Clause + license_expression_spdx: GPL-2.0-only OR BSD-3-Clause from_file: start_line: 594 end_line: 601 @@ -692,7 +692,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 613 end_line: 635 @@ -732,7 +732,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 646 end_line: 668 @@ -772,7 +772,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 677 end_line: 697 @@ -810,7 +810,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 705 end_line: 715 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qlogic.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qlogic.copyright-detailed.expected.yml index ece97531fb..1a05a9c7fd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qlogic.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-qlogic.copyright-detailed.expected.yml @@ -16,7 +16,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 9 end_line: 28 @@ -53,7 +53,7 @@ license_detections: license_expression_spdx: Linux-OpenIB matches: - license_expression: linux-openib - spdx_license_expression: Linux-OpenIB + license_expression_spdx: Linux-OpenIB from_file: start_line: 35 end_line: 55 @@ -91,7 +91,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-qlogic-microcode matches: - license_expression: qlogic-microcode - spdx_license_expression: LicenseRef-scancode-qlogic-microcode + license_expression_spdx: LicenseRef-scancode-qlogic-microcode from_file: start_line: 61 end_line: 96 @@ -144,7 +144,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-proprietary-license matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 102 end_line: 104 @@ -160,7 +160,7 @@ license_detections: in hexadecimal or equivalent format, provided this copyright notice is accompanying it. - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 106 end_line: 112 @@ -184,7 +184,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 117 end_line: 119 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ralink.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ralink.copyright-detailed.expected.yml index daaded87d2..9b0003d93d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ralink.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ralink.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 6 end_line: 20 @@ -36,7 +36,7 @@ license_detections: along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 22 end_line: 23 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-realtek.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-realtek.copyright-detailed.expected.yml index 05bf4eb59a..7582be136e 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-realtek.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-realtek.copyright-detailed.expected.yml @@ -10,7 +10,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 9 end_line: 11 @@ -30,7 +30,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-intel matches: - license_expression: intel - spdx_license_expression: LicenseRef-scancode-intel + license_expression_spdx: LicenseRef-scancode-intel from_file: start_line: 18 end_line: 53 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-samsung.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-samsung.copyright-detailed.expected.yml index 2e559cc954..cb049be8ff 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-samsung.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-samsung.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 6 end_line: 13 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-siano.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-siano.copyright-detailed.expected.yml index 21eb5eec93..275379dc5c 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-siano.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-siano.copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 9 end_line: 34 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ti-connectivity.copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ti-connectivity.copyright-detailed.expected.yml index 8312e83203..b30382221d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ti-connectivity.copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/f/firmware-nonfree/stable_firmware-ti-connectivity.copyright-detailed.expected.yml @@ -9,7 +9,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 9 end_line: 65 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-mongos/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-mongos/copyright-detailed.expected.yml index 3303753210..a820f05ec9 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-mongos/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-mongos/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: SSPL-1.0 matches: - license_expression: mongodb-sspl-1.0 - spdx_license_expression: SSPL-1.0 + license_expression_spdx: SSPL-1.0 from_file: start_line: 18 end_line: 23 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-server/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-server/copyright-detailed.expected.yml index 3303753210..a820f05ec9 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-server/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-server/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: SSPL-1.0 matches: - license_expression: mongodb-sspl-1.0 - spdx_license_expression: SSPL-1.0 + license_expression_spdx: SSPL-1.0 from_file: start_line: 18 end_line: 23 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-shell/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-shell/copyright-detailed.expected.yml index 3303753210..a820f05ec9 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-shell/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-shell/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: SSPL-1.0 matches: - license_expression: mongodb-sspl-1.0 - spdx_license_expression: SSPL-1.0 + license_expression_spdx: SSPL-1.0 from_file: start_line: 18 end_line: 23 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-tools/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-tools/copyright-detailed.expected.yml index 3303753210..a820f05ec9 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-tools/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org-tools/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: SSPL-1.0 matches: - license_expression: mongodb-sspl-1.0 - spdx_license_expression: SSPL-1.0 + license_expression_spdx: SSPL-1.0 from_file: start_line: 18 end_line: 23 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org/copyright-detailed.expected.yml index 3303753210..a820f05ec9 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/mongodb-org/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: SSPL-1.0 matches: - license_expression: mongodb-sspl-1.0 - spdx_license_expression: SSPL-1.0 + license_expression_spdx: SSPL-1.0 from_file: start_line: 18 end_line: 23 diff --git a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/r/raspi3-firmware/stable_copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/r/raspi3-firmware/stable_copyright-detailed.expected.yml index fd724b31be..d84259cfa0 100644 --- a/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/r/raspi3-firmware/stable_copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-2019-11-15/non-free/r/raspi3-firmware/stable_copyright-detailed.expected.yml @@ -13,7 +13,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 21 end_line: 45 @@ -55,7 +55,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-broadcom-proprietary matches: - license_expression: broadcom-proprietary - spdx_license_expression: LicenseRef-scancode-broadcom-proprietary + license_expression_spdx: LicenseRef-scancode-broadcom-proprietary from_file: start_line: 51 end_line: 254 @@ -211,7 +211,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 260 end_line: 260 @@ -224,7 +224,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 261 end_line: 275 diff --git a/tests/packagedcode/data/debian/copyright/debian-misc/usr/share/doc/zlib1g/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-misc/usr/share/doc/zlib1g/copyright-detailed.expected.yml index b1ff22e729..cba6659ff5 100644 --- a/tests/packagedcode/data/debian/copyright/debian-misc/usr/share/doc/zlib1g/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-misc/usr/share/doc/zlib1g/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 42 end_line: 59 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/adduser/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/adduser/copyright-detailed.expected.yml index b24722e725..a209ff5d70 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/adduser/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/adduser/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 28 end_line: 47 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/apt/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/apt/copyright-detailed.expected.yml index 7928466259..30059215bc 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/apt/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/apt/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 4 end_line: 4 @@ -21,7 +21,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_374.RULE matched_text: 'License: GPLv2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 6 end_line: 22 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/base-files/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/base-files/copyright-detailed.expected.yml index f9e07ad0b0..233b901c2f 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/base-files/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/base-files/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 17 end_line: 28 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/base-passwd/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/base-passwd/copyright-detailed.expected.yml index 13798ea924..76033f4b8e 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/base-passwd/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/base-passwd/copyright-detailed.expected.yml @@ -14,7 +14,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 23 end_line: 23 @@ -27,7 +27,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 24 end_line: 25 @@ -46,7 +46,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 13 end_line: 13 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/bash/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/bash/copyright-detailed.expected.yml index 47b2c1bfba..4df9b428dc 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/bash/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/bash/copyright-detailed.expected.yml @@ -14,7 +14,7 @@ license_detections: AND GPL-1.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 13 end_line: 26 @@ -41,7 +41,7 @@ license_detections: On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. - license_expression: bash-exception-gpl - spdx_license_expression: LicenseRef-scancode-bash-exception-gpl-2.0 + license_expression_spdx: LicenseRef-scancode-bash-exception-gpl-2.0 from_file: start_line: 28 end_line: 34 @@ -61,7 +61,7 @@ license_detections: exception applies to any program that serves as a shell and that is based primarily on Bash as opposed to other GNU software. - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 37 end_line: 37 @@ -78,7 +78,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 44 end_line: 48 @@ -100,7 +100,7 @@ license_detections: license_expression_spdx: GFDL-1.3-or-later matches: - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: 55 end_line: 64 @@ -127,7 +127,7 @@ license_detections: license_expression_spdx: GFDL-1.3-or-later matches: - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: 71 end_line: 76 @@ -150,7 +150,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive AND Latex2e matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 82 end_line: 84 @@ -166,7 +166,7 @@ license_detections: this manual provided the copyright notice and this permission notice pare preserved on all copies. - license_expression: latex2e - spdx_license_expression: Latex2e + license_expression_spdx: Latex2e from_file: start_line: 86 end_line: 99 @@ -197,7 +197,7 @@ license_detections: license_expression_spdx: Latex2e matches: - license_expression: latex2e - spdx_license_expression: Latex2e + license_expression_spdx: Latex2e from_file: start_line: 108 end_line: 124 @@ -231,7 +231,7 @@ license_detections: license_expression_spdx: GFDL-1.3-or-later matches: - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: 132 end_line: 137 @@ -254,7 +254,7 @@ license_detections: license_expression_spdx: Latex2e matches: - license_expression: latex2e - spdx_license_expression: Latex2e + license_expression_spdx: Latex2e from_file: start_line: 144 end_line: 160 @@ -288,7 +288,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC AND HPND matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 168 end_line: '194' @@ -328,7 +328,7 @@ license_detections: * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - license_expression: historical - spdx_license_expression: HPND + license_expression_spdx: HPND from_file: start_line: '198' end_line: 212 @@ -360,7 +360,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 220 end_line: 223 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/bsdutils/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/bsdutils/copyright-detailed.expected.yml index bc7191dbd7..a6d4f5d7fd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/bsdutils/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/bsdutils/copyright-detailed.expected.yml @@ -75,7 +75,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 345 end_line: 346 @@ -94,7 +94,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 350 end_line: 350 @@ -107,7 +107,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 351 end_line: 365 @@ -139,7 +139,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 367 end_line: 367 @@ -152,7 +152,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 368 end_line: 383 @@ -185,7 +185,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 385 end_line: 385 @@ -198,7 +198,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 386 end_line: 400 @@ -230,7 +230,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 403 end_line: 410 @@ -255,7 +255,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 413 end_line: 437 @@ -297,7 +297,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 440 end_line: 466 @@ -341,7 +341,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 468 end_line: 468 @@ -354,7 +354,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE matched_text: 'License: lgpl' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 469 end_line: 473 @@ -376,7 +376,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 475 end_line: 475 @@ -389,7 +389,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 476 end_line: 490 @@ -421,7 +421,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 492 end_line: 492 @@ -434,7 +434,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 493 end_line: 508 @@ -467,7 +467,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 510 end_line: 510 @@ -480,7 +480,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 511 end_line: 525 @@ -512,7 +512,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 528 end_line: 546 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/coreutils/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/coreutils/copyright-detailed.expected.yml index fe9ea8e985..c489532e6e 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/coreutils/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/coreutils/copyright-detailed.expected.yml @@ -12,7 +12,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 22 end_line: 41 @@ -49,7 +49,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 47 end_line: 69 @@ -89,7 +89,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 78 end_line: 89 @@ -118,7 +118,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 95 end_line: 117 @@ -158,7 +158,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 126 end_line: 137 @@ -187,7 +187,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 145 end_line: 157 @@ -217,7 +217,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 162 end_line: 173 @@ -246,7 +246,7 @@ license_detections: license_expression_spdx: FSFULLR matches: - license_expression: fsf-unlimited - spdx_license_expression: FSFULLR + license_expression_spdx: FSFULLR from_file: start_line: 180 end_line: 182 @@ -266,7 +266,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: '193' end_line: 214 @@ -301,7 +301,7 @@ license_detections: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 213 end_line: 224 @@ -330,7 +330,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 233 end_line: 244 @@ -359,7 +359,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 253 end_line: 264 @@ -388,7 +388,7 @@ license_detections: license_expression_spdx: GFDL-1.2-or-later matches: - license_expression: gfdl-1.2-plus - spdx_license_expression: GFDL-1.2-or-later + license_expression_spdx: GFDL-1.2-or-later from_file: start_line: 272 end_line: 277 @@ -411,7 +411,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 285 end_line: 299 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/dash/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/dash/copyright-detailed.expected.yml index 29a4d0baf9..385b534373 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/dash/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/dash/copyright-detailed.expected.yml @@ -50,7 +50,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 155 end_line: 177 @@ -90,7 +90,7 @@ other_license_detections: license_expression_spdx: FSFUL matches: - license_expression: fsf-free - spdx_license_expression: FSFUL + license_expression_spdx: FSFUL from_file: start_line: 180 end_line: 181 @@ -109,7 +109,7 @@ other_license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 184 end_line: '191' @@ -134,7 +134,7 @@ other_license_detections: license_expression_spdx: X11 AND LicenseRef-scancode-public-domain matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: '194' end_line: 214 @@ -168,7 +168,7 @@ other_license_detections: ings in this Software without prior written authorization from the X Consor- tium. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 216 end_line: 216 @@ -185,7 +185,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 218 end_line: 218 @@ -198,7 +198,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 219 end_line: 234 @@ -231,7 +231,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 138 end_line: 138 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debconf/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debconf/copyright-detailed.expected.yml index 23db0ea39c..5254da5e2c 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debconf/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debconf/copyright-detailed.expected.yml @@ -25,7 +25,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 59 end_line: 78 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debian-archive-keyring/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debian-archive-keyring/copyright-detailed.expected.yml index a9f0a968be..9c67cf567f 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debian-archive-keyring/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debian-archive-keyring/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 6 end_line: 26 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debianutils/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debianutils/copyright-detailed.expected.yml index 891b6dd93e..03e64ded0d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debianutils/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/debianutils/copyright-detailed.expected.yml @@ -9,7 +9,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later AND LicenseRef-scancode-public-domain matches: - license_expression: gpl-2.0-plus AND public-domain - spdx_license_expression: GPL-2.0-or-later AND LicenseRef-scancode-public-domain + license_expression_spdx: GPL-2.0-or-later AND LicenseRef-scancode-public-domain from_file: start_line: 8 end_line: 11 @@ -30,7 +30,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-smail-gpl matches: - license_expression: smail-gpl - spdx_license_expression: LicenseRef-scancode-smail-gpl + license_expression_spdx: LicenseRef-scancode-smail-gpl from_file: start_line: 18 end_line: 161 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/diffutils/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/diffutils/copyright-detailed.expected.yml index 738e2206da..08ec63bfe1 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/diffutils/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/diffutils/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 18 end_line: 29 @@ -37,7 +37,7 @@ license_detections: license_expression_spdx: GFDL-1.3-or-later matches: - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: 38 end_line: 44 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/dpkg/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/dpkg/copyright-detailed.expected.yml index 337678c635..96112b9cbd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/dpkg/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/dpkg/copyright-detailed.expected.yml @@ -24,7 +24,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 102 end_line: 102 @@ -37,7 +37,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE matched_text: public domain. - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 103 end_line: 104 @@ -52,7 +52,7 @@ other_license_detections: May be used and distributed freely for any purpose. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 106 end_line: 106 @@ -65,7 +65,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_346.RULE matched_text: also placed in public domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 107 end_line: 108 @@ -80,7 +80,7 @@ other_license_detections: also placed in the Public Domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 111 end_line: 111 @@ -97,7 +97,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 118 end_line: 120 @@ -117,7 +117,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 127 end_line: 127 @@ -130,7 +130,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 128 end_line: 139 @@ -155,7 +155,7 @@ other_license_detections: You should have received a copy of the GNU General Public License along with this program. If not, see . - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 141 end_line: 143 @@ -175,7 +175,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 145 end_line: 145 @@ -188,7 +188,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 146 end_line: 156 @@ -216,7 +216,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 159 end_line: 178 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/e2fsprogs/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/e2fsprogs/copyright-detailed.expected.yml index 43de122800..881eeb6a0d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/e2fsprogs/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/e2fsprogs/copyright-detailed.expected.yml @@ -10,7 +10,7 @@ license_detections: license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP matches: - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert - spdx_license_expression: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP + license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP from_file: start_line: 17 end_line: 30 @@ -35,7 +35,7 @@ license_detections: license_expression_spdx: NTP-0 AND BSD-3-Clause matches: - license_expression: ntp-0 - spdx_license_expression: NTP-0 + license_expression_spdx: NTP-0 from_file: start_line: 38 end_line: 45 @@ -56,7 +56,7 @@ license_detections: this software for any purpose. It is provided "as is" without express or implied warranty. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 49 end_line: 73 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/findutils/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/findutils/copyright-detailed.expected.yml index 16b1070155..3f84981516 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/findutils/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/findutils/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later AND GFDL-1.3-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 49 end_line: 73 @@ -46,7 +46,7 @@ license_detections: document under the terms of the GNU Free Documentation License, Version - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: 71 end_line: 81 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-10-base/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-10-base/copyright-detailed.expected.yml index 4366329891..cfdefb19e3 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-10-base/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-10-base/copyright-detailed.expected.yml @@ -42,7 +42,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 matches: - license_expression: gpl-3.0-plus WITH gcc-exception-3.1 - spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1 + license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 from_file: start_line: 83 end_line: 99 @@ -72,7 +72,7 @@ license_detections: Public License is in `/usr/share/common-licenses/GPL', version 3 of this license in `/usr/share/common-licenses/GPL-3'. - license_expression: gpl-3.0-plus WITH gcc-exception-3.1 - spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1 + license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 from_file: start_line: 101 end_line: 103 @@ -92,7 +92,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 123 end_line: 149 @@ -125,7 +125,7 @@ license_detections: license_expression_spdx: NCSA AND MIT matches: - license_expression: uoi-ncsa - spdx_license_expression: NCSA + license_expression_spdx: NCSA from_file: start_line: 167 end_line: '192' @@ -164,7 +164,7 @@ license_detections: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: '194' end_line: 210 @@ -198,7 +198,7 @@ license_detections: license_expression_spdx: MIT AND GFDL-1.2-only AND GCC-exception-3.1 matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 217 end_line: 234 @@ -229,7 +229,7 @@ license_detections: ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - license_expression: gfdl-1.2 - spdx_license_expression: GFDL-1.2-only + license_expression_spdx: GFDL-1.2-only from_file: start_line: 237 end_line: 239 @@ -245,7 +245,7 @@ license_detections: On Debian GNU/Linux systems, the complete text of this license is in `/usr/share/common-licenses/GFDL-1.2'. - license_expression: gcc-exception-3.1 - spdx_license_expression: GCC-exception-3.1 + license_expression_spdx: GCC-exception-3.1 from_file: start_line: 242 end_line: 313 @@ -334,7 +334,7 @@ license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 322 end_line: 331 @@ -361,7 +361,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 338 end_line: 346 @@ -387,7 +387,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 356 end_line: 364 @@ -413,7 +413,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 374 end_line: 382 @@ -439,7 +439,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 387 end_line: 387 @@ -456,7 +456,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 395 end_line: 403 @@ -482,7 +482,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 410 end_line: 418 @@ -508,7 +508,7 @@ license_detections: license_expression_spdx: SunPro matches: - license_expression: sunpro - spdx_license_expression: SunPro + license_expression_spdx: SunPro from_file: start_line: 424 end_line: 427 @@ -529,7 +529,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 434 end_line: 458 @@ -571,7 +571,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 473 end_line: 480 @@ -596,7 +596,7 @@ license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-only matches: - license_expression: artistic-perl-1.0 OR gpl-1.0 - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-only + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-only from_file: start_line: 490 end_line: 495 @@ -619,7 +619,7 @@ license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 503 end_line: 517 @@ -651,7 +651,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-d-zlib matches: - license_expression: d-zlib - spdx_license_expression: LicenseRef-scancode-d-zlib + license_expression_spdx: LicenseRef-scancode-d-zlib from_file: start_line: 529 end_line: 545 @@ -685,7 +685,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 557 end_line: 574 @@ -720,7 +720,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 matches: - license_expression: gpl-3.0-plus WITH gcc-exception-3.1 - spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1 + license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 from_file: start_line: 581 end_line: 598 @@ -755,7 +755,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 609 end_line: 617 @@ -781,7 +781,7 @@ license_detections: license_expression_spdx: GFDL-1.3-or-later matches: - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: 623 end_line: 626 @@ -803,7 +803,7 @@ license_detections: GCC-exception-3.1 matches: - license_expression: lgpl-2.1-plus WITH gcc-exception-3.1 - spdx_license_expression: LGPL-2.1-or-later WITH GCC-exception-3.1 + license_expression_spdx: LGPL-2.1-or-later WITH GCC-exception-3.1 from_file: start_line: 635 end_line: 647 @@ -829,7 +829,7 @@ license_detections: permissions described in the GCC Runtime Library Exception, version 3.1, as published by the Free Software Foundation. - license_expression: gpl-3.0-plus WITH gcc-exception-3.1 - spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1 + license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 from_file: start_line: 650 end_line: 651 @@ -851,7 +851,7 @@ license_detections: (GPL-3.0-only AND LGPL-2.1-only) AND (GPL-2.0-or-later AND GPL-3.0-or-later) matches: - license_expression: gpl-3.0 AND lgpl-2.1 AND lgpl-3.0 - spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only + license_expression_spdx: GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only from_file: start_line: 663 end_line: 663 @@ -864,7 +864,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE matched_text: mix of GPL-3.0 and LGPL-2.1/3 - license_expression: gpl-3.0 AND lgpl-2.1 AND lgpl-3.0 - spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only + license_expression_spdx: GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only from_file: start_line: 666 end_line: 666 @@ -877,7 +877,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE matched_text: mix of GPL-3.0 and LGPL-2.1/3 - license_expression: lgpl-2.0 AND gpl-3.0 - spdx_license_expression: LGPL-2.0-only AND GPL-3.0-only + license_expression_spdx: LGPL-2.0-only AND GPL-3.0-only from_file: start_line: 670 end_line: 670 @@ -890,7 +890,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_and_gpl-3.0_1.RULE matched_text: Mix of LGPL-2.1 and GPL-3.0. - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 673 end_line: 673 @@ -903,7 +903,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE matched_text: GPL-3+ - license_expression: gnu-emacs-gpl-1988 - spdx_license_expression: LicenseRef-scancode-gnu-emacs-gpl-1988 + license_expression_spdx: LicenseRef-scancode-gnu-emacs-gpl-1988 from_file: start_line: 676 end_line: 682 @@ -923,7 +923,7 @@ license_detections: ;; file named COPYING. Among other things, the copyright notice ;; and this notice must be preserved on all copies. - license_expression: gpl-3.0 AND lgpl-2.1 - spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only + license_expression_spdx: GPL-3.0-only AND LGPL-2.1-only from_file: start_line: 686 end_line: 686 @@ -936,7 +936,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_lgpl-2.1_2.RULE matched_text: Mix of GPL-3 and LGPL-2.1. - license_expression: gpl-2.0-plus AND gpl-3.0-plus - spdx_license_expression: GPL-2.0-or-later AND GPL-3.0-or-later + license_expression_spdx: GPL-2.0-or-later AND GPL-3.0-or-later from_file: start_line: 690 end_line: 690 @@ -953,7 +953,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later WITH GCC-exception-3.1 matches: - license_expression: lgpl-2.1-plus WITH gcc-exception-3.1 - spdx_license_expression: LGPL-2.1-or-later WITH GCC-exception-3.1 + license_expression_spdx: LGPL-2.1-or-later WITH GCC-exception-3.1 from_file: start_line: 701 end_line: 713 @@ -983,7 +983,7 @@ license_detections: license_expression_spdx: LGPL-2.0-or-later AND GPL-1.0-or-later matches: - license_expression: lgpl-2.0-plus AND gpl-1.0-plus - spdx_license_expression: LGPL-2.0-or-later AND GPL-1.0-or-later + license_expression_spdx: LGPL-2.0-or-later AND GPL-1.0-or-later from_file: start_line: 739 end_line: 745 @@ -1007,7 +1007,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-bsla-no-advert matches: - license_expression: bsla-no-advert - spdx_license_expression: LicenseRef-scancode-bsla-no-advert + license_expression_spdx: LicenseRef-scancode-bsla-no-advert from_file: start_line: 754 end_line: 764 @@ -1032,7 +1032,7 @@ license_detections: license_expression_spdx: BSD-4.3TAHOE matches: - license_expression: bsla - spdx_license_expression: BSD-4.3TAHOE + license_expression_spdx: BSD-4.3TAHOE from_file: start_line: 771 end_line: 781 @@ -1060,7 +1060,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 789 end_line: 815 @@ -1104,7 +1104,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 822 end_line: 844 @@ -1144,7 +1144,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 856 end_line: 882 @@ -1188,7 +1188,7 @@ license_detections: license_expression_spdx: BSD-3-Clause-flex matches: - license_expression: flex-2.5 - spdx_license_expression: BSD-3-Clause-flex + license_expression_spdx: BSD-3-Clause-flex from_file: start_line: 889 end_line: 901 @@ -1218,7 +1218,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 909 end_line: 909 @@ -1238,7 +1238,7 @@ license_detections: matches: - license_expression: gpl-3.0 AND gpl-2.0 AND lgpl-3.0-plus WITH cygwin-exception-lgpl-3.0-plus AND other-copyleft AND other-permissive - spdx_license_expression: GPL-3.0-only AND GPL-2.0-only AND LGPL-3.0-or-later WITH LicenseRef-scancode-cygwin-exception-lgpl-3.0-plus + license_expression_spdx: GPL-3.0-only AND GPL-2.0-only AND LGPL-3.0-or-later WITH LicenseRef-scancode-cygwin-exception-lgpl-3.0-plus AND LicenseRef-scancode-other-copyleft AND LicenseRef-scancode-other-permissive from_file: start_line: 919 @@ -1259,7 +1259,7 @@ license_detections: license_expression_spdx: dtoa matches: - license_expression: x11-lucent - spdx_license_expression: dtoa + license_expression_spdx: dtoa from_file: start_line: 929 end_line: 938 @@ -1286,7 +1286,7 @@ license_detections: license_expression_spdx: AMD-newlib matches: - license_expression: amd-historical - spdx_license_expression: AMD-newlib + license_expression_spdx: AMD-newlib from_file: start_line: 944 end_line: 955 @@ -1315,7 +1315,7 @@ license_detections: license_expression_spdx: SunPro matches: - license_expression: sunpro - spdx_license_expression: SunPro + license_expression_spdx: SunPro from_file: start_line: 983 end_line: 986 @@ -1334,7 +1334,7 @@ license_detections: license_expression_spdx: HP-1986 matches: - license_expression: hp-1986 - spdx_license_expression: HP-1986 + license_expression_spdx: HP-1986 from_file: start_line: 992 end_line: 1001 @@ -1361,7 +1361,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-nilsson-historical matches: - license_expression: nilsson-historical - spdx_license_expression: LicenseRef-scancode-nilsson-historical + license_expression_spdx: LicenseRef-scancode-nilsson-historical from_file: start_line: 1007 end_line: 1014 @@ -1386,7 +1386,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-newlib-historical matches: - license_expression: newlib-historical - spdx_license_expression: LicenseRef-scancode-newlib-historical + license_expression_spdx: LicenseRef-scancode-newlib-historical from_file: start_line: 1020 end_line: 1028 @@ -1412,7 +1412,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1035 end_line: 1055 @@ -1450,7 +1450,7 @@ license_detections: license_expression_spdx: AMD-newlib matches: - license_expression: amd-historical - spdx_license_expression: AMD-newlib + license_expression_spdx: AMD-newlib from_file: start_line: 1061 end_line: 1072 @@ -1474,7 +1474,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1087 end_line: 1112 @@ -1517,7 +1517,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1119 end_line: 1138 @@ -1554,7 +1554,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1145 end_line: 1164 @@ -1591,7 +1591,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1171 end_line: 1190 @@ -1628,7 +1628,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-x11-hanson matches: - license_expression: x11-hanson - spdx_license_expression: LicenseRef-scancode-x11-hanson + license_expression_spdx: LicenseRef-scancode-x11-hanson from_file: start_line: 1198 end_line: 1207 @@ -1655,7 +1655,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1214 end_line: 1233 @@ -1692,7 +1692,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1240 end_line: 1260 @@ -1730,7 +1730,7 @@ license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 1274 end_line: 1274 @@ -1747,7 +1747,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 1281 end_line: 1294 @@ -1774,7 +1774,7 @@ license_detections: Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 1296 end_line: 1296 @@ -1787,7 +1787,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_33.RULE matched_text: LGPL License ( - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 1300 end_line: 1308 @@ -1810,7 +1810,7 @@ license_detections: license_expression_spdx: HPND-Intel matches: - license_expression: intel-osl-1993 - spdx_license_expression: HPND-Intel + license_expression_spdx: HPND-Intel from_file: start_line: 1314 end_line: 1336 @@ -1850,7 +1850,7 @@ license_detections: license_expression_spdx: HP-1986 matches: - license_expression: hp-1986 - spdx_license_expression: HP-1986 + license_expression_spdx: HP-1986 from_file: start_line: 1342 end_line: 1351 @@ -1877,7 +1877,7 @@ license_detections: license_expression_spdx: Spencer-94 matches: - license_expression: hs-regexp - spdx_license_expression: Spencer-94 + license_expression_spdx: Spencer-94 from_file: start_line: 1356 end_line: 1374 @@ -1913,7 +1913,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1381 end_line: 1400 @@ -1950,7 +1950,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1407 end_line: 1426 @@ -1987,7 +1987,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1435 end_line: 1454 @@ -2024,7 +2024,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1466 end_line: 1489 @@ -2058,7 +2058,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-unicode AND LGPL-2.1-or-later matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 1494 end_line: 1511 @@ -2089,7 +2089,7 @@ license_detections: COPYRIGHT AND PERMISSION NOTICE - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 1513 end_line: 1543 @@ -2133,7 +2133,7 @@ license_detections: dealings in these Data Files or Software without prior written authorization of the copyright holder. - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 1547 end_line: 1561 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-9-base/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-9-base/copyright-detailed.expected.yml index d38a4b4003..5b271da761 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-9-base/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-9-base/copyright-detailed.expected.yml @@ -48,7 +48,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 matches: - license_expression: gpl-3.0-plus WITH gcc-exception-3.1 - spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1 + license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 from_file: start_line: 83 end_line: 99 @@ -78,7 +78,7 @@ license_detections: Public License is in `/usr/share/common-licenses/GPL', version 3 of this license in `/usr/share/common-licenses/GPL-3'. - license_expression: gpl-3.0-plus WITH gcc-exception-3.1 - spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1 + license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 from_file: start_line: 101 end_line: 103 @@ -98,7 +98,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 123 end_line: 149 @@ -131,7 +131,7 @@ license_detections: license_expression_spdx: NCSA AND MIT matches: - license_expression: uoi-ncsa - spdx_license_expression: NCSA + license_expression_spdx: NCSA from_file: start_line: 167 end_line: '192' @@ -170,7 +170,7 @@ license_detections: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: '194' end_line: 210 @@ -204,7 +204,7 @@ license_detections: license_expression_spdx: MIT AND GFDL-1.2-only AND GCC-exception-3.1 matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 217 end_line: 234 @@ -235,7 +235,7 @@ license_detections: ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - license_expression: gfdl-1.2 - spdx_license_expression: GFDL-1.2-only + license_expression_spdx: GFDL-1.2-only from_file: start_line: 237 end_line: 239 @@ -251,7 +251,7 @@ license_detections: On Debian GNU/Linux systems, the complete text of this license is in `/usr/share/common-licenses/GFDL-1.2'. - license_expression: gcc-exception-3.1 - spdx_license_expression: GCC-exception-3.1 + license_expression_spdx: GCC-exception-3.1 from_file: start_line: 242 end_line: 313 @@ -340,7 +340,7 @@ license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 322 end_line: 331 @@ -367,7 +367,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 338 end_line: 346 @@ -393,7 +393,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 356 end_line: 364 @@ -419,7 +419,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 374 end_line: 382 @@ -445,7 +445,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 387 end_line: 387 @@ -462,7 +462,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 395 end_line: 403 @@ -488,7 +488,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 410 end_line: 418 @@ -514,7 +514,7 @@ license_detections: license_expression_spdx: SunPro matches: - license_expression: sunpro - spdx_license_expression: SunPro + license_expression_spdx: SunPro from_file: start_line: 424 end_line: 427 @@ -535,7 +535,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 434 end_line: 458 @@ -577,7 +577,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 473 end_line: 480 @@ -602,7 +602,7 @@ license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-only matches: - license_expression: artistic-perl-1.0 OR gpl-1.0 - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-only + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-only from_file: start_line: 490 end_line: 495 @@ -625,7 +625,7 @@ license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 503 end_line: 517 @@ -657,7 +657,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-d-zlib matches: - license_expression: d-zlib - spdx_license_expression: LicenseRef-scancode-d-zlib + license_expression_spdx: LicenseRef-scancode-d-zlib from_file: start_line: 529 end_line: 545 @@ -691,7 +691,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 557 end_line: 574 @@ -726,7 +726,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 matches: - license_expression: gpl-3.0-plus WITH gcc-exception-3.1 - spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1 + license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 from_file: start_line: 581 end_line: 598 @@ -761,7 +761,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 606 end_line: 614 @@ -787,7 +787,7 @@ license_detections: license_expression_spdx: GFDL-1.3-or-later matches: - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: 620 end_line: 623 @@ -808,7 +808,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 629 end_line: 637 @@ -834,7 +834,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 matches: - license_expression: gpl-3.0-plus WITH gcc-exception-3.1 - spdx_license_expression: GPL-3.0-or-later WITH GCC-exception-3.1 + license_expression_spdx: GPL-3.0-or-later WITH GCC-exception-3.1 from_file: start_line: 643 end_line: 646 @@ -855,7 +855,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 661 end_line: 669 @@ -881,7 +881,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 675 end_line: 683 @@ -907,7 +907,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 705 end_line: 713 @@ -933,7 +933,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later AND (GPL-3.0-only AND LGPL-2.1-only) matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 728 end_line: 736 @@ -955,7 +955,7 @@ license_detections: FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - license_expression: gpl-3.0 AND lgpl-2.1 - spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only + license_expression_spdx: GPL-3.0-only AND LGPL-2.1-only from_file: start_line: 739 end_line: 739 @@ -972,7 +972,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 757 end_line: 765 @@ -998,7 +998,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 771 end_line: 779 @@ -1027,7 +1027,7 @@ license_detections: AND LicenseRef-scancode-gnu-emacs-gpl-1988 matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 785 end_line: 793 @@ -1049,7 +1049,7 @@ license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - license_expression: lgpl-3.0 AND gpl-3.0 - spdx_license_expression: LGPL-3.0-only AND GPL-3.0-only + license_expression_spdx: LGPL-3.0-only AND GPL-3.0-only from_file: start_line: 797 end_line: 797 @@ -1062,7 +1062,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0_and_gpl-3.0_3.RULE matched_text: mix of GPL-3.0 and LGPL-3.0 - license_expression: gpl-3.0 AND lgpl-2.1 AND lgpl-3.0 - spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only + license_expression_spdx: GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only from_file: start_line: 801 end_line: 801 @@ -1075,7 +1075,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE matched_text: mix of GPL-3.0 and LGPL-2.1/3 - license_expression: gpl-3.0 AND lgpl-2.1 AND lgpl-3.0 - spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only + license_expression_spdx: GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only from_file: start_line: 805 end_line: 805 @@ -1088,7 +1088,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_lgpl-2.1_and_lgpl-3.0_1.RULE matched_text: mix of GPL-3.0 and LGPL-2.1/3 - license_expression: lgpl-2.0 AND gpl-3.0 - spdx_license_expression: LGPL-2.0-only AND GPL-3.0-only + license_expression_spdx: LGPL-2.0-only AND GPL-3.0-only from_file: start_line: 809 end_line: 809 @@ -1101,7 +1101,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0_and_gpl-3.0_1.RULE matched_text: Mix of LGPL-2.1 and GPL-3.0. - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 812 end_line: 812 @@ -1114,7 +1114,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_89.RULE matched_text: GPL-3+ - license_expression: gnu-emacs-gpl-1988 - spdx_license_expression: LicenseRef-scancode-gnu-emacs-gpl-1988 + license_expression_spdx: LicenseRef-scancode-gnu-emacs-gpl-1988 from_file: start_line: 815 end_line: 821 @@ -1138,7 +1138,7 @@ license_detections: license_expression_spdx: (GPL-3.0-only AND LGPL-2.1-only) AND (GPL-2.0-or-later AND GPL-3.0-or-later) matches: - license_expression: gpl-3.0 AND lgpl-2.1 - spdx_license_expression: GPL-3.0-only AND LGPL-2.1-only + license_expression_spdx: GPL-3.0-only AND LGPL-2.1-only from_file: start_line: 826 end_line: 826 @@ -1151,7 +1151,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0_and_lgpl-2.1_2.RULE matched_text: Mix of GPL-3 and LGPL-2.1. - license_expression: gpl-2.0-plus AND gpl-3.0-plus - spdx_license_expression: GPL-2.0-or-later AND GPL-3.0-or-later + license_expression_spdx: GPL-2.0-or-later AND GPL-3.0-or-later from_file: start_line: 830 end_line: 830 @@ -1170,7 +1170,7 @@ license_detections: AND (LGPL-2.1-only AND LGPL-3.0-only) matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 837 end_line: 845 @@ -1192,7 +1192,7 @@ license_detections: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - license_expression: lgpl-2.1 AND lgpl-3.0 AND gpl-3.0 - spdx_license_expression: LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only + license_expression_spdx: LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only from_file: start_line: 849 end_line: 849 @@ -1205,7 +1205,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_and_lgpl-3.0_and_gpl-3.0_1.RULE matched_text: Mix of LGPL-2.1, LGPL-3 and GPL-3. - license_expression: lgpl-2.1 AND lgpl-3.0 - spdx_license_expression: LGPL-2.1-only AND LGPL-3.0-only + license_expression_spdx: LGPL-2.1-only AND LGPL-3.0-only from_file: start_line: 853 end_line: 853 @@ -1218,7 +1218,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_and_lgpl-3.0_1.RULE matched_text: Mix of LGPL-2.1 and LGPL-3. - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 857 end_line: 866 @@ -1245,7 +1245,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 872 end_line: 880 @@ -1271,7 +1271,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 886 end_line: 894 @@ -1297,7 +1297,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 899 end_line: 907 @@ -1323,7 +1323,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 913 end_line: 921 @@ -1349,7 +1349,7 @@ license_detections: license_expression_spdx: LGPL-2.0-or-later AND GPL-1.0-or-later matches: - license_expression: lgpl-2.0-plus AND gpl-1.0-plus - spdx_license_expression: LGPL-2.0-or-later AND GPL-1.0-or-later + license_expression_spdx: LGPL-2.0-or-later AND GPL-1.0-or-later from_file: start_line: 947 end_line: 953 @@ -1373,7 +1373,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-bsla-no-advert matches: - license_expression: bsla-no-advert - spdx_license_expression: LicenseRef-scancode-bsla-no-advert + license_expression_spdx: LicenseRef-scancode-bsla-no-advert from_file: start_line: 962 end_line: 972 @@ -1398,7 +1398,7 @@ license_detections: license_expression_spdx: BSD-4.3TAHOE matches: - license_expression: bsla - spdx_license_expression: BSD-4.3TAHOE + license_expression_spdx: BSD-4.3TAHOE from_file: start_line: 979 end_line: 989 @@ -1426,7 +1426,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 997 end_line: 1023 @@ -1470,7 +1470,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1030 end_line: 1052 @@ -1510,7 +1510,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 1064 end_line: 1090 @@ -1554,7 +1554,7 @@ license_detections: license_expression_spdx: BSD-3-Clause-flex matches: - license_expression: flex-2.5 - spdx_license_expression: BSD-3-Clause-flex + license_expression_spdx: BSD-3-Clause-flex from_file: start_line: 1097 end_line: 1109 @@ -1584,7 +1584,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 1117 end_line: 1117 @@ -1604,7 +1604,7 @@ license_detections: matches: - license_expression: gpl-3.0 AND gpl-2.0 AND lgpl-3.0-plus WITH cygwin-exception-lgpl-3.0-plus AND other-copyleft AND other-permissive - spdx_license_expression: GPL-3.0-only AND GPL-2.0-only AND LGPL-3.0-or-later WITH LicenseRef-scancode-cygwin-exception-lgpl-3.0-plus + license_expression_spdx: GPL-3.0-only AND GPL-2.0-only AND LGPL-3.0-or-later WITH LicenseRef-scancode-cygwin-exception-lgpl-3.0-plus AND LicenseRef-scancode-other-copyleft AND LicenseRef-scancode-other-permissive from_file: start_line: 1127 @@ -1625,7 +1625,7 @@ license_detections: license_expression_spdx: dtoa matches: - license_expression: x11-lucent - spdx_license_expression: dtoa + license_expression_spdx: dtoa from_file: start_line: 1137 end_line: 1146 @@ -1652,7 +1652,7 @@ license_detections: license_expression_spdx: AMD-newlib matches: - license_expression: amd-historical - spdx_license_expression: AMD-newlib + license_expression_spdx: AMD-newlib from_file: start_line: 1152 end_line: 1163 @@ -1681,7 +1681,7 @@ license_detections: license_expression_spdx: SunPro matches: - license_expression: sunpro - spdx_license_expression: SunPro + license_expression_spdx: SunPro from_file: start_line: 1191 end_line: 1194 @@ -1700,7 +1700,7 @@ license_detections: license_expression_spdx: HP-1986 matches: - license_expression: hp-1986 - spdx_license_expression: HP-1986 + license_expression_spdx: HP-1986 from_file: start_line: 1200 end_line: 1209 @@ -1727,7 +1727,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-nilsson-historical matches: - license_expression: nilsson-historical - spdx_license_expression: LicenseRef-scancode-nilsson-historical + license_expression_spdx: LicenseRef-scancode-nilsson-historical from_file: start_line: 1215 end_line: 1222 @@ -1752,7 +1752,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-newlib-historical matches: - license_expression: newlib-historical - spdx_license_expression: LicenseRef-scancode-newlib-historical + license_expression_spdx: LicenseRef-scancode-newlib-historical from_file: start_line: 1228 end_line: 1236 @@ -1778,7 +1778,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1243 end_line: 1263 @@ -1816,7 +1816,7 @@ license_detections: license_expression_spdx: AMD-newlib matches: - license_expression: amd-historical - spdx_license_expression: AMD-newlib + license_expression_spdx: AMD-newlib from_file: start_line: 1269 end_line: 1280 @@ -1840,7 +1840,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1295 end_line: 1320 @@ -1883,7 +1883,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1327 end_line: 1346 @@ -1920,7 +1920,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1353 end_line: 1372 @@ -1957,7 +1957,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1379 end_line: 1398 @@ -1994,7 +1994,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-x11-hanson matches: - license_expression: x11-hanson - spdx_license_expression: LicenseRef-scancode-x11-hanson + license_expression_spdx: LicenseRef-scancode-x11-hanson from_file: start_line: 1406 end_line: 1415 @@ -2021,7 +2021,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1422 end_line: 1441 @@ -2058,7 +2058,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1448 end_line: 1468 @@ -2096,7 +2096,7 @@ license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 1482 end_line: 1482 @@ -2113,7 +2113,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 1489 end_line: 1502 @@ -2140,7 +2140,7 @@ license_detections: Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 1504 end_line: 1504 @@ -2153,7 +2153,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_33.RULE matched_text: LGPL License ( - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 1508 end_line: 1516 @@ -2176,7 +2176,7 @@ license_detections: license_expression_spdx: HPND-Intel matches: - license_expression: intel-osl-1993 - spdx_license_expression: HPND-Intel + license_expression_spdx: HPND-Intel from_file: start_line: 1522 end_line: 1544 @@ -2216,7 +2216,7 @@ license_detections: license_expression_spdx: HP-1986 matches: - license_expression: hp-1986 - spdx_license_expression: HP-1986 + license_expression_spdx: HP-1986 from_file: start_line: 1550 end_line: 1559 @@ -2243,7 +2243,7 @@ license_detections: license_expression_spdx: Spencer-94 matches: - license_expression: hs-regexp - spdx_license_expression: Spencer-94 + license_expression_spdx: Spencer-94 from_file: start_line: 1564 end_line: 1582 @@ -2279,7 +2279,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1589 end_line: 1608 @@ -2316,7 +2316,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1615 end_line: 1634 @@ -2353,7 +2353,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1643 end_line: 1662 @@ -2390,7 +2390,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1674 end_line: 1697 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gpgv/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gpgv/copyright-detailed.expected.yml index eb23f0a2ff..b954325bb1 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gpgv/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gpgv/copyright-detailed.expected.yml @@ -41,7 +41,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 85 end_line: 110 @@ -84,7 +84,7 @@ other_license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 114 end_line: 121 @@ -109,7 +109,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-ietf matches: - license_expression: ietf - spdx_license_expression: LicenseRef-scancode-ietf + license_expression_spdx: LicenseRef-scancode-ietf from_file: start_line: 129 end_line: 144 @@ -142,7 +142,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 147 end_line: 147 @@ -155,7 +155,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 148 end_line: 163 @@ -188,7 +188,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 165 end_line: 165 @@ -201,7 +201,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 166 end_line: 181 @@ -234,7 +234,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 183 end_line: 183 @@ -247,7 +247,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 184 end_line: '199' @@ -280,7 +280,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 202 end_line: 225 @@ -321,7 +321,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 228 end_line: 245 @@ -356,7 +356,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 247 end_line: 247 @@ -369,7 +369,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE matched_text: 'License: cc0-1.0' - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 248 end_line: 253 @@ -392,7 +392,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 81 end_line: 81 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/grep/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/grep/copyright-detailed.expected.yml index b3a299104c..c925c86da2 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/grep/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/grep/copyright-detailed.expected.yml @@ -13,7 +13,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 23 end_line: 23 @@ -26,7 +26,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 27 end_line: 45 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gzip/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gzip/copyright-detailed.expected.yml index 47454e79e8..36b220192b 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gzip/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gzip/copyright-detailed.expected.yml @@ -18,7 +18,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 25 end_line: 25 @@ -31,7 +31,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 26 end_line: 40 @@ -63,7 +63,7 @@ other_license_detections: license_expression_spdx: GFDL-1.3-or-later matches: - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: 43 end_line: 50 @@ -88,7 +88,7 @@ other_license_detections: license_expression_spdx: Latex2e matches: - license_expression: latex2e - spdx_license_expression: Latex2e + license_expression_spdx: Latex2e from_file: start_line: 53 end_line: 70 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/hostname/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/hostname/copyright-detailed.expected.yml index d59f57e8ac..351c256f3c 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/hostname/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/hostname/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 12 end_line: 26 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/init-system-helpers/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/init-system-helpers/copyright-detailed.expected.yml index 64bc9fcf9f..c264aa84dd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/init-system-helpers/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/init-system-helpers/copyright-detailed.expected.yml @@ -18,7 +18,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 25 end_line: 25 @@ -31,7 +31,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 26 end_line: 41 @@ -64,7 +64,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 47 end_line: 70 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libacl1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libacl1/copyright-detailed.expected.yml index eb501c707b..f423a65d4b 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libacl1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libacl1/copyright-detailed.expected.yml @@ -13,7 +13,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 8 end_line: 8 @@ -26,7 +26,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 9 end_line: 20 @@ -51,7 +51,7 @@ other_license_detections: You should have received a copy of the GNU General Public License along with this program. If not, see . - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 22 end_line: 23 @@ -70,7 +70,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 39 end_line: 39 @@ -83,7 +83,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 40 end_line: 51 @@ -112,7 +112,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 22 end_line: 23 @@ -131,7 +131,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 53 end_line: 54 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libapt-pkg6.0/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libapt-pkg6.0/copyright-detailed.expected.yml index 7928466259..30059215bc 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libapt-pkg6.0/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libapt-pkg6.0/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 4 end_line: 4 @@ -21,7 +21,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_374.RULE matched_text: 'License: GPLv2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 6 end_line: 22 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libattr1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libattr1/copyright-detailed.expected.yml index eb0873af9b..005df8ada6 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libattr1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libattr1/copyright-detailed.expected.yml @@ -13,7 +13,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 8 end_line: 8 @@ -26,7 +26,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 9 end_line: 20 @@ -51,7 +51,7 @@ other_license_detections: You should have received a copy of the GNU General Public License along with this program. If not, see . - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 22 end_line: 23 @@ -70,7 +70,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 32 end_line: 32 @@ -83,7 +83,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 33 end_line: 44 @@ -112,7 +112,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 22 end_line: 23 @@ -131,7 +131,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 46 end_line: 47 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libaudit-common/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libaudit-common/copyright-detailed.expected.yml index 66b9004d6b..becb955e08 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libaudit-common/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libaudit-common/copyright-detailed.expected.yml @@ -16,7 +16,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 16 end_line: 16 @@ -29,7 +29,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 17 end_line: 21 @@ -51,7 +51,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 28 end_line: 28 @@ -64,7 +64,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 29 end_line: 43 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libblkid1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libblkid1/copyright-detailed.expected.yml index bc7191dbd7..a6d4f5d7fd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libblkid1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libblkid1/copyright-detailed.expected.yml @@ -75,7 +75,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 345 end_line: 346 @@ -94,7 +94,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 350 end_line: 350 @@ -107,7 +107,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 351 end_line: 365 @@ -139,7 +139,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 367 end_line: 367 @@ -152,7 +152,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 368 end_line: 383 @@ -185,7 +185,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 385 end_line: 385 @@ -198,7 +198,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 386 end_line: 400 @@ -230,7 +230,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 403 end_line: 410 @@ -255,7 +255,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 413 end_line: 437 @@ -297,7 +297,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 440 end_line: 466 @@ -341,7 +341,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 468 end_line: 468 @@ -354,7 +354,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE matched_text: 'License: lgpl' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 469 end_line: 473 @@ -376,7 +376,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 475 end_line: 475 @@ -389,7 +389,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 476 end_line: 490 @@ -421,7 +421,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 492 end_line: 492 @@ -434,7 +434,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 493 end_line: 508 @@ -467,7 +467,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 510 end_line: 510 @@ -480,7 +480,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 511 end_line: 525 @@ -512,7 +512,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 528 end_line: 546 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libbz2-1.0/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libbz2-1.0/copyright-detailed.expected.yml index 6afd69f2aa..9b6a1ad1d8 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libbz2-1.0/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libbz2-1.0/copyright-detailed.expected.yml @@ -11,7 +11,7 @@ other_license_detections: license_expression_spdx: bzip2-1.0.6 matches: - license_expression: bzip2-libbzip-2010 - spdx_license_expression: bzip2-1.0.6 + license_expression_spdx: bzip2-1.0.6 from_file: start_line: 8 end_line: 37 @@ -58,7 +58,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 46 end_line: 46 @@ -71,7 +71,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 47 end_line: 48 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libc-bin/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libc-bin/copyright-detailed.expected.yml index e8d13f255e..8447378de3 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libc-bin/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libc-bin/copyright-detailed.expected.yml @@ -17,7 +17,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 10 end_line: 26 @@ -51,7 +51,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later AND BSD-3-Clause matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 33 end_line: 48 @@ -80,7 +80,7 @@ license_detections: On Debian systems, the complete text of the GNU Library General Public License can be found in `/usr/share/common-licenses/GPL-2'. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 50 end_line: 51 @@ -99,7 +99,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 56 end_line: 80 @@ -141,7 +141,7 @@ license_detections: license_expression_spdx: HPND matches: - license_expression: historical - spdx_license_expression: HPND + license_expression_spdx: HPND from_file: start_line: 88 end_line: 102 @@ -173,7 +173,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 108 end_line: 119 @@ -202,7 +202,7 @@ license_detections: license_expression_spdx: BSD-3-Clause AND CMU-Mach matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 126 end_line: 151 @@ -241,7 +241,7 @@ license_detections: NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: carnegie-mellon-contributors - spdx_license_expression: CMU-Mach + license_expression_spdx: CMU-Mach from_file: start_line: 153 end_line: 179 @@ -281,7 +281,7 @@ license_detections: extensions that they make and grant Carnegie Mellon the rights to redistribute these changes. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 181 end_line: 206 @@ -320,7 +320,7 @@ license_detections: OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 208 end_line: 211 @@ -341,7 +341,7 @@ license_detections: license_expression_spdx: BSD-3-Clause AND Inner-Net-2.0 matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 217 end_line: 242 @@ -380,7 +380,7 @@ license_detections: NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: inner-net-2.0 - spdx_license_expression: Inner-Net-2.0 + license_expression_spdx: Inner-Net-2.0 from_file: start_line: 245 end_line: 280 @@ -433,7 +433,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 286 end_line: 289 @@ -454,7 +454,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 298 end_line: 309 @@ -479,7 +479,7 @@ license_detections: You should have received a copy of the GNU Lesser General Public License along with GNU Libidn; if not, see . - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 313 end_line: 314 @@ -498,7 +498,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-punycode AND LicenseRef-scancode-ietf matches: - license_expression: punycode - spdx_license_expression: LicenseRef-scancode-punycode + license_expression_spdx: LicenseRef-scancode-punycode from_file: start_line: 324 end_line: 332 @@ -520,7 +520,7 @@ license_detections: misleading author or version information. Derivative works need not be licensed under similar terms. - license_expression: ietf - spdx_license_expression: LicenseRef-scancode-ietf + license_expression_spdx: LicenseRef-scancode-ietf from_file: start_line: 336 end_line: 358 @@ -560,7 +560,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 365 end_line: 387 @@ -600,7 +600,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 395 end_line: 409 @@ -632,7 +632,7 @@ license_detections: license_expression_spdx: Spencer-94 matches: - license_expression: hs-regexp - spdx_license_expression: Spencer-94 + license_expression_spdx: Spencer-94 from_file: start_line: 414 end_line: 432 @@ -668,7 +668,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-pcre matches: - license_expression: pcre - spdx_license_expression: LicenseRef-scancode-pcre + license_expression_spdx: LicenseRef-scancode-pcre from_file: start_line: 438 end_line: 473 @@ -721,7 +721,7 @@ license_detections: license_expression_spdx: SunPro matches: - license_expression: sunpro - spdx_license_expression: SunPro + license_expression_spdx: SunPro from_file: start_line: 479 end_line: 482 @@ -742,7 +742,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 488 end_line: 491 @@ -763,7 +763,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 497 end_line: 509 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libc6/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libc6/copyright-detailed.expected.yml index e8d13f255e..8447378de3 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libc6/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libc6/copyright-detailed.expected.yml @@ -17,7 +17,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 10 end_line: 26 @@ -51,7 +51,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later AND BSD-3-Clause matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 33 end_line: 48 @@ -80,7 +80,7 @@ license_detections: On Debian systems, the complete text of the GNU Library General Public License can be found in `/usr/share/common-licenses/GPL-2'. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 50 end_line: 51 @@ -99,7 +99,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 56 end_line: 80 @@ -141,7 +141,7 @@ license_detections: license_expression_spdx: HPND matches: - license_expression: historical - spdx_license_expression: HPND + license_expression_spdx: HPND from_file: start_line: 88 end_line: 102 @@ -173,7 +173,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 108 end_line: 119 @@ -202,7 +202,7 @@ license_detections: license_expression_spdx: BSD-3-Clause AND CMU-Mach matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 126 end_line: 151 @@ -241,7 +241,7 @@ license_detections: NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: carnegie-mellon-contributors - spdx_license_expression: CMU-Mach + license_expression_spdx: CMU-Mach from_file: start_line: 153 end_line: 179 @@ -281,7 +281,7 @@ license_detections: extensions that they make and grant Carnegie Mellon the rights to redistribute these changes. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 181 end_line: 206 @@ -320,7 +320,7 @@ license_detections: OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 208 end_line: 211 @@ -341,7 +341,7 @@ license_detections: license_expression_spdx: BSD-3-Clause AND Inner-Net-2.0 matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 217 end_line: 242 @@ -380,7 +380,7 @@ license_detections: NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: inner-net-2.0 - spdx_license_expression: Inner-Net-2.0 + license_expression_spdx: Inner-Net-2.0 from_file: start_line: 245 end_line: 280 @@ -433,7 +433,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 286 end_line: 289 @@ -454,7 +454,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later AND LGPL-2.0-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 298 end_line: 309 @@ -479,7 +479,7 @@ license_detections: You should have received a copy of the GNU Lesser General Public License along with GNU Libidn; if not, see . - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 313 end_line: 314 @@ -498,7 +498,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-punycode AND LicenseRef-scancode-ietf matches: - license_expression: punycode - spdx_license_expression: LicenseRef-scancode-punycode + license_expression_spdx: LicenseRef-scancode-punycode from_file: start_line: 324 end_line: 332 @@ -520,7 +520,7 @@ license_detections: misleading author or version information. Derivative works need not be licensed under similar terms. - license_expression: ietf - spdx_license_expression: LicenseRef-scancode-ietf + license_expression_spdx: LicenseRef-scancode-ietf from_file: start_line: 336 end_line: 358 @@ -560,7 +560,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 365 end_line: 387 @@ -600,7 +600,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 395 end_line: 409 @@ -632,7 +632,7 @@ license_detections: license_expression_spdx: Spencer-94 matches: - license_expression: hs-regexp - spdx_license_expression: Spencer-94 + license_expression_spdx: Spencer-94 from_file: start_line: 414 end_line: 432 @@ -668,7 +668,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-pcre matches: - license_expression: pcre - spdx_license_expression: LicenseRef-scancode-pcre + license_expression_spdx: LicenseRef-scancode-pcre from_file: start_line: 438 end_line: 473 @@ -721,7 +721,7 @@ license_detections: license_expression_spdx: SunPro matches: - license_expression: sunpro - spdx_license_expression: SunPro + license_expression_spdx: SunPro from_file: start_line: 479 end_line: 482 @@ -742,7 +742,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 488 end_line: 491 @@ -763,7 +763,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 497 end_line: 509 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcap-ng0/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcap-ng0/copyright-detailed.expected.yml index d923a71bef..5c47e29e6e 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcap-ng0/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcap-ng0/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 10 end_line: 27 @@ -30,7 +30,7 @@ license_detections: \ library; if not, write to the Free Software\n Foundation, Inc., 51 Franklin St,\ \ Fifth Floor, Boston,\n MA 02110-1301, USA.\n\nsee `/usr/share/common-licenses/LGPL-2.1'." - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 30 end_line: 31 @@ -49,7 +49,7 @@ license_detections: license_expression_spdx: GPL-3.0-only matches: - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 37 end_line: 38 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcom-err2/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcom-err2/copyright-detailed.expected.yml index cfba6a19b8..af97c02e9b 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcom-err2/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcom-err2/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: NTP matches: - license_expression: mit-old-style-no-advert - spdx_license_expression: NTP + license_expression_spdx: NTP from_file: start_line: 14 end_line: 24 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcrypt1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcrypt1/copyright-detailed.expected.yml index 778226105c..64496a30b3 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcrypt1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libcrypt1/copyright-detailed.expected.yml @@ -21,7 +21,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 14 end_line: 16 @@ -42,7 +42,7 @@ license_detections: AND 0BSD AND BSD-2-Clause matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 22 end_line: 22 @@ -55,7 +55,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_392.RULE matched_text: 'LGPL (v2.1 or later):' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 25 end_line: 25 @@ -68,7 +68,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_392.RULE matched_text: 'LGPL (v2.1 or later):' - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 29 end_line: 29 @@ -81,7 +81,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_308.RULE matched_text: '3-clause BSD:' - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 33 end_line: 33 @@ -94,7 +94,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE matched_text: Public domain, written by - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 36 end_line: 36 @@ -107,7 +107,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE matched_text: Public domain, written by - license_expression: bsd-zero - spdx_license_expression: 0BSD + license_expression_spdx: 0BSD from_file: start_line: 40 end_line: 40 @@ -120,7 +120,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE matched_text: '0-clause BSD:' - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 43 end_line: 43 @@ -133,7 +133,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE matched_text: '2-clause BSD:' - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 47 end_line: 47 @@ -146,7 +146,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE matched_text: '2-clause BSD:' - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 50 end_line: 50 @@ -163,7 +163,7 @@ license_detections: license_expression_spdx: 0BSD matches: - license_expression: bsd-zero - spdx_license_expression: 0BSD + license_expression_spdx: 0BSD from_file: start_line: 55 end_line: 55 @@ -181,7 +181,7 @@ license_detections: BSD-3-Clause matches: - license_expression: bsd-zero - spdx_license_expression: 0BSD + license_expression_spdx: 0BSD from_file: start_line: 61 end_line: 61 @@ -194,7 +194,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE matched_text: '0-clause BSD:' - license_expression: bsd-zero - spdx_license_expression: 0BSD + license_expression_spdx: 0BSD from_file: start_line: 64 end_line: 64 @@ -207,7 +207,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE matched_text: '0-clause BSD:' - license_expression: bsd-zero - spdx_license_expression: 0BSD + license_expression_spdx: 0BSD from_file: start_line: 67 end_line: 67 @@ -220,7 +220,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE matched_text: '0-clause BSD:' - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 71 end_line: 71 @@ -233,7 +233,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE matched_text: '2-clause BSD:' - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 74 end_line: 74 @@ -246,7 +246,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE matched_text: '2-clause BSD:' - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 77 end_line: 77 @@ -259,7 +259,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_426.RULE matched_text: Public domain, written by - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 80 end_line: 80 @@ -272,7 +272,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_308.RULE matched_text: '3-clause BSD:' - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 83 end_line: 83 @@ -285,7 +285,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-simplified_156.RULE matched_text: '2-clause BSD:' - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 86 end_line: 86 @@ -304,7 +304,7 @@ license_detections: AND GPL-2.0-or-later WITH Autoconf-exception-generic AND LicenseRef-scancode-free-unknown matches: - license_expression: gpl-3.0-plus WITH autoconf-exception-3.0 - spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-3.0 + license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-3.0 from_file: start_line: 98 end_line: 98 @@ -317,7 +317,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_autoconf-exception-3.0_3.RULE matched_text: 'GPL (v3 or later), with Autoconf exception:' - license_expression: bsd-zero - spdx_license_expression: 0BSD + license_expression_spdx: 0BSD from_file: start_line: 101 end_line: 101 @@ -330,7 +330,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-zero_6.RULE matched_text: '0-clause BSD:' - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 104 end_line: 104 @@ -343,7 +343,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE matched_text: 'FSF All Permissive License:' - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 107 end_line: 107 @@ -356,7 +356,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE matched_text: 'FSF All Permissive License:' - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 111 end_line: 111 @@ -369,7 +369,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE matched_text: 'FSF All Permissive License:' - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 114 end_line: 114 @@ -382,7 +382,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE matched_text: 'FSF All Permissive License:' - license_expression: gpl-2.0-plus WITH autoconf-simple-exception-2.0 - spdx_license_expression: GPL-2.0-or-later WITH Autoconf-exception-generic + license_expression_spdx: GPL-2.0-or-later WITH Autoconf-exception-generic from_file: start_line: 118 end_line: 118 @@ -395,7 +395,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_with_autoconf-simple-exception-2.0_17.RULE matched_text: 'GPL (v2 or later), with Autoconf exception:' - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 121 end_line: 121 @@ -408,7 +408,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE matched_text: 'FSF All Permissive License:' - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 124 end_line: 124 @@ -421,7 +421,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE matched_text: 'FSF All Permissive License:' - license_expression: gpl-3.0-plus WITH autoconf-exception-3.0 - spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-3.0 + license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-3.0 from_file: start_line: 128 end_line: 128 @@ -434,7 +434,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_with_autoconf-exception-3.0_3.RULE matched_text: 'GPL (v3 or later), with Autoconf exception:' - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 131 end_line: 131 @@ -447,7 +447,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE matched_text: 'FSF All Permissive License:' - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 134 end_line: 134 @@ -460,7 +460,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/fsf-ap_6.RULE matched_text: 'FSF All Permissive License:' - license_expression: free-unknown - spdx_license_expression: LicenseRef-scancode-free-unknown + license_expression_spdx: LicenseRef-scancode-free-unknown from_file: start_line: 137 end_line: 139 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libdb5.3/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libdb5.3/copyright-detailed.expected.yml index febe0535e8..ccd07cb670 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libdb5.3/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libdb5.3/copyright-detailed.expected.yml @@ -9,7 +9,7 @@ license_detections: license_expression_spdx: Sleepycat matches: - license_expression: sleepycat - spdx_license_expression: Sleepycat + license_expression_spdx: Sleepycat from_file: start_line: 5 end_line: 12 @@ -34,7 +34,7 @@ license_detections: license_expression_spdx: Sleepycat matches: - license_expression: sleepycat - spdx_license_expression: Sleepycat + license_expression_spdx: Sleepycat from_file: start_line: 18 end_line: 47 @@ -81,7 +81,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 53 end_line: 75 @@ -121,7 +121,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 81 end_line: 103 @@ -161,7 +161,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 111 end_line: 133 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libdebconfclient0/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libdebconfclient0/copyright-detailed.expected.yml index 97051873a5..4096d43b61 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libdebconfclient0/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libdebconfclient0/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 17 end_line: 17 @@ -25,7 +25,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-bsd-unmodified matches: - license_expression: bsd-unmodified - spdx_license_expression: LicenseRef-scancode-bsd-unmodified + license_expression_spdx: LicenseRef-scancode-bsd-unmodified from_file: start_line: 22 end_line: 41 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libext2fs2/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libext2fs2/copyright-detailed.expected.yml index 43de122800..881eeb6a0d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libext2fs2/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libext2fs2/copyright-detailed.expected.yml @@ -10,7 +10,7 @@ license_detections: license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP matches: - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert - spdx_license_expression: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP + license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP from_file: start_line: 17 end_line: 30 @@ -35,7 +35,7 @@ license_detections: license_expression_spdx: NTP-0 AND BSD-3-Clause matches: - license_expression: ntp-0 - spdx_license_expression: NTP-0 + license_expression_spdx: NTP-0 from_file: start_line: 38 end_line: 45 @@ -56,7 +56,7 @@ license_detections: this software for any purpose. It is provided "as is" without express or implied warranty. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 49 end_line: 73 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libffi7/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libffi7/copyright-detailed.expected.yml index 7eb4c39b43..7b8f8eb65d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libffi7/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libffi7/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: MIT AND GPL-2.0-or-later AND GPL-1.0-or-later matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 42 end_line: 59 @@ -39,7 +39,7 @@ license_detections: TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 62 end_line: 70 @@ -61,7 +61,7 @@ license_detections: Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 69 end_line: 76 @@ -82,7 +82,7 @@ license_detections: On Debian GNU/Linux systems, the complete text of the GNU General Public License is in `/usr/share/common-licenses/GPL'. - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 79 end_line: 79 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgcrypt20/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgcrypt20/copyright-detailed.expected.yml index ae11f11e4b..df176c3fa9 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgcrypt20/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgcrypt20/copyright-detailed.expected.yml @@ -23,7 +23,7 @@ license_detections: GPL-2.0-or-later) matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 210 end_line: 211 @@ -38,7 +38,7 @@ license_detections: taken from the original NTT provided GPL source. - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 215 end_line: 215 @@ -51,7 +51,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/other-permissive_319.RULE matched_text: It has a permissive license - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 218 end_line: 218 @@ -64,7 +64,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_311.RULE matched_text: public domain code - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 222 end_line: 228 @@ -84,7 +84,7 @@ license_detections: WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - license_expression: lgpl-2.1-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-2.1-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-2.1-or-later AND GPL-2.0-or-later from_file: start_line: 231 end_line: 236 @@ -103,7 +103,7 @@ license_detections: binaries. See below for details. The documentation is licensed under the GPLv2 (or later), see below. - license_expression: lgpl-2.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later AND GPL-2.0-or-later from_file: start_line: 240 end_line: 260 @@ -141,7 +141,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later AND GPL-1.0-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 270 end_line: 286 @@ -171,7 +171,7 @@ license_detections: General Public License can be found in `/usr/share/common-licenses/LGPL'; - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 288 end_line: 288 @@ -188,7 +188,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 294 end_line: 298 @@ -210,7 +210,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft matches: - license_expression: other-permissive AND other-copyleft - spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft + license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft from_file: start_line: 307 end_line: 308 @@ -229,7 +229,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 315 end_line: 315 @@ -246,7 +246,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 330 end_line: 357 @@ -291,7 +291,7 @@ license_detections: license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later matches: - license_expression: bsd-new OR gpl-1.0-plus - spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later + license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later from_file: start_line: 372 end_line: 402 @@ -339,7 +339,7 @@ license_detections: license_expression_spdx: X11 matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: 413 end_line: 433 @@ -377,7 +377,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 436 end_line: 436 @@ -394,7 +394,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain AND LicenseRef-scancode-ocb-open-source-2013 matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 443 end_line: 444 @@ -409,7 +409,7 @@ license_detections: Licence: I hereby disclaim the copyright on this code and place it in the public domain. - license_expression: ocb-open-source-2013 - spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013 + license_expression_spdx: LicenseRef-scancode-ocb-open-source-2013 from_file: start_line: 447 end_line: 447 @@ -426,7 +426,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ocb-open-source-2013 matches: - license_expression: ocb-open-source-2013 - spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013 + license_expression_spdx: LicenseRef-scancode-ocb-open-source-2013 from_file: start_line: 453 end_line: 457 @@ -444,7 +444,7 @@ license_detections: http://web.cs.ucdavis.edu/~rogaway/ocb/license1.pdf for the full license document; - license_expression: ocb-open-source-2013 - spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013 + license_expression_spdx: LicenseRef-scancode-ocb-open-source-2013 from_file: start_line: 459 end_line: 466 @@ -465,7 +465,7 @@ license_detections: open-source software implementation of OCB claiming that you have a patent covering their implementation. - license_expression: ocb-open-source-2013 - spdx_license_expression: LicenseRef-scancode-ocb-open-source-2013 + license_expression_spdx: LicenseRef-scancode-ocb-open-source-2013 from_file: start_line: 470 end_line: 540 @@ -553,7 +553,7 @@ license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 545 end_line: 546 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgmp10/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgmp10/copyright-detailed.expected.yml index cf3694aac0..cc960939ec 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgmp10/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgmp10/copyright-detailed.expected.yml @@ -10,7 +10,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later OR GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus OR gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later OR GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later OR GPL-2.0-or-later from_file: start_line: '19' end_line: 46 @@ -55,7 +55,7 @@ license_detections: license_expression_spdx: GFDL-1.1-or-later AND (LGPL-2.0-or-later OR GPL-1.0-or-later) matches: - license_expression: gfdl-1.1-plus - spdx_license_expression: GFDL-1.1-or-later + license_expression_spdx: GFDL-1.1-or-later from_file: start_line: 52 end_line: 55 @@ -72,7 +72,7 @@ license_detections: meet the Debian Free Software Guidelines, and is not shipped in the debian packages. - license_expression: lgpl-2.0-plus OR gpl-1.0-plus - spdx_license_expression: LGPL-2.0-or-later OR GPL-1.0-or-later + license_expression_spdx: LGPL-2.0-or-later OR GPL-1.0-or-later from_file: start_line: 57 end_line: 58 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgnutls30/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgnutls30/copyright-detailed.expected.yml index 234932b28e..f15e4357ea 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgnutls30/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgnutls30/copyright-detailed.expected.yml @@ -55,7 +55,7 @@ license_detections: GPL-2.0-or-later) matches: - license_expression: lgpl-2.1-plus AND gpl-3.0-plus AND (lgpl-3.0-plus AND gpl-2.0-plus) - spdx_license_expression: LGPL-2.1-or-later AND GPL-3.0-or-later AND (LGPL-3.0-or-later + license_expression_spdx: LGPL-2.1-or-later AND GPL-3.0-or-later AND (LGPL-3.0-or-later AND GPL-2.0-or-later) from_file: start_line: 221 @@ -86,7 +86,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 244 end_line: 255 @@ -115,7 +115,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later AND GFDL-1.1-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 265 end_line: 276 @@ -140,7 +140,7 @@ license_detections: * You should have received a copy of the GNU General Public License * along with this program. If not, see . - license_expression: gfdl-1.1-plus - spdx_license_expression: GFDL-1.1-or-later + license_expression_spdx: GFDL-1.1-or-later from_file: start_line: 280 end_line: 281 @@ -159,7 +159,7 @@ license_detections: license_expression_spdx: GFDL-1.3-or-later matches: - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: 286 end_line: 291 @@ -183,7 +183,7 @@ license_detections: AND GFDL-1.3-only matches: - license_expression: lgpl-2.0-plus AND lgpl-3.0 AND gpl-1.0-plus AND gpl-3.0 AND gfdl-1.3 - spdx_license_expression: LGPL-2.0-or-later AND LGPL-3.0-only AND GPL-1.0-or-later AND + license_expression_spdx: LGPL-2.0-or-later AND LGPL-3.0-only AND GPL-1.0-or-later AND GPL-3.0-only AND GFDL-1.3-only from_file: start_line: 321 @@ -208,7 +208,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later AND (LGPL-3.0-or-later OR GPL-2.0-or-later) matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 336 end_line: 337 @@ -223,7 +223,7 @@ license_detections: released under the GNU Lesser General Public License (LGPL) version 2.1 or later. - license_expression: lgpl-3.0-plus OR gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later OR GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later OR GPL-2.0-or-later from_file: start_line: 340 end_line: 342 @@ -243,7 +243,7 @@ license_detections: license_expression_spdx: LGPL-2.0-or-later AND GPL-3.0-only matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 347 end_line: 347 @@ -256,7 +256,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_48.RULE matched_text: GNU LGPL - license_expression: gpl-3.0 - spdx_license_expression: GPL-3.0-only + license_expression_spdx: GPL-3.0-only from_file: start_line: 349 end_line: 349 @@ -273,7 +273,7 @@ license_detections: license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later matches: - license_expression: bsd-new OR gpl-1.0-plus - spdx_license_expression: BSD-3-Clause OR GPL-1.0-or-later + license_expression_spdx: BSD-3-Clause OR GPL-1.0-or-later from_file: start_line: 370 end_line: 402 @@ -323,7 +323,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 417 end_line: 435 @@ -359,7 +359,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 446 end_line: 447 @@ -378,7 +378,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 458 end_line: 469 @@ -407,7 +407,7 @@ license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 476 end_line: 504 @@ -455,7 +455,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 510 end_line: 510 @@ -468,7 +468,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE matched_text: 'License: Expat' - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 511 end_line: 527 @@ -502,7 +502,7 @@ license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 533 end_line: 543 @@ -526,7 +526,7 @@ license_detections: * See the License for the specific language governing permissions and * limitations under the License. - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 546 end_line: 548 @@ -546,7 +546,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 556 end_line: 556 @@ -563,7 +563,7 @@ license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 564 end_line: 566 @@ -583,7 +583,7 @@ license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 572 end_line: 585 @@ -614,7 +614,7 @@ license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 591 end_line: 604 @@ -645,7 +645,7 @@ license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 610 end_line: 611 @@ -660,7 +660,7 @@ license_detections: Comment: On Debian systems the complete license text is available in /usr/share/common-licenses/Apache-2.0 - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 612 end_line: 614 @@ -680,7 +680,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 619 end_line: 619 @@ -693,7 +693,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE matched_text: 'License: Expat' - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 620 end_line: 636 @@ -727,7 +727,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 645 end_line: 645 @@ -740,7 +740,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE matched_text: 'License: Expat' - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 646 end_line: 662 @@ -774,7 +774,7 @@ license_detections: license_expression_spdx: MIT AND LGPL-2.1-or-later matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 667 end_line: 667 @@ -787,7 +787,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE matched_text: 'License: Expat' - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 668 end_line: 684 @@ -817,7 +817,7 @@ license_detections: * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 688 end_line: 688 @@ -834,7 +834,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 695 end_line: 695 @@ -847,7 +847,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 699 end_line: 699 @@ -864,7 +864,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 705 end_line: 705 @@ -877,7 +877,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_437.RULE matched_text: 'License: Expat' - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 706 end_line: 723 @@ -912,7 +912,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 729 end_line: 729 @@ -929,7 +929,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 735 end_line: 735 @@ -946,7 +946,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 741 end_line: 741 @@ -959,7 +959,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 745 end_line: 745 @@ -972,7 +972,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 749 end_line: 749 @@ -985,7 +985,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 753 end_line: 753 @@ -1002,7 +1002,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 759 end_line: 759 @@ -1019,7 +1019,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 764 end_line: 764 @@ -1032,7 +1032,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 768 end_line: 768 @@ -1045,7 +1045,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 772 end_line: 772 @@ -1058,7 +1058,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 776 end_line: 776 @@ -1071,7 +1071,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 780 end_line: 780 @@ -1088,7 +1088,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 785 end_line: 785 @@ -1101,7 +1101,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 789 end_line: 789 @@ -1118,7 +1118,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 794 end_line: 794 @@ -1135,7 +1135,7 @@ license_detections: license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 799 end_line: 799 @@ -1148,7 +1148,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 803 end_line: 803 @@ -1165,7 +1165,7 @@ license_detections: license_expression_spdx: (LGPL-3.0-or-later AND GPL-2.0-or-later) AND MIT matches: - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 808 end_line: 808 @@ -1178,7 +1178,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 809 end_line: 826 @@ -1213,7 +1213,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 838 end_line: 855 @@ -1250,7 +1250,7 @@ license_detections: AND (LGPL-3.0-or-later OR GPL-2.0-or-later) matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 866 end_line: 877 @@ -1275,7 +1275,7 @@ license_detections: * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, see . - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 880 end_line: 880 @@ -1288,7 +1288,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus AND gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later AND GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later AND GPL-2.0-or-later from_file: start_line: 884 end_line: 884 @@ -1301,7 +1301,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_and_gpl-2.0-plus_1.RULE matched_text: 'License: LGPLv3+_or_GPLv2+' - license_expression: lgpl-3.0-plus OR gpl-2.0-plus - spdx_license_expression: LGPL-3.0-or-later OR GPL-2.0-or-later + license_expression_spdx: LGPL-3.0-or-later OR GPL-2.0-or-later from_file: start_line: 885 end_line: 907 @@ -1341,7 +1341,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 927 end_line: 927 @@ -1358,7 +1358,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 940 end_line: 940 @@ -1375,7 +1375,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 945 end_line: 945 @@ -1388,7 +1388,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 949 end_line: 949 @@ -1405,7 +1405,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 954 end_line: 954 @@ -1422,7 +1422,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later AND LGPL-2.1-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 964 end_line: 964 @@ -1435,7 +1435,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 968 end_line: 968 @@ -1448,7 +1448,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_299.RULE matched_text: 'License: LGPLv2.1+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 972 end_line: 972 @@ -1465,7 +1465,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 978 end_line: 978 @@ -1482,7 +1482,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 983 end_line: 983 @@ -1499,7 +1499,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 988 end_line: 988 @@ -1516,7 +1516,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 993 end_line: 993 @@ -1533,7 +1533,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 999 end_line: 999 @@ -1550,7 +1550,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1006 end_line: 1006 @@ -1567,7 +1567,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1011 end_line: 1011 @@ -1580,7 +1580,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1015 end_line: 1015 @@ -1593,7 +1593,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1019 end_line: 1019 @@ -1610,7 +1610,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later AND LGPL-2.1-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1024 end_line: 1024 @@ -1623,7 +1623,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1028 end_line: 1028 @@ -1636,7 +1636,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1032 end_line: 1032 @@ -1649,7 +1649,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1036 end_line: 1036 @@ -1662,7 +1662,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 1040 end_line: 1040 @@ -1679,7 +1679,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1047 end_line: 1047 @@ -1696,7 +1696,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1052 end_line: 1052 @@ -1709,7 +1709,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1056 end_line: 1056 @@ -1726,7 +1726,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1061 end_line: 1061 @@ -1739,7 +1739,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1065 end_line: 1065 @@ -1752,7 +1752,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_112.RULE matched_text: 'License: GPLv3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 1069 end_line: 1069 @@ -1769,7 +1769,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1074 end_line: 1074 @@ -1782,7 +1782,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_195.RULE matched_text: 'License: BSD-3-Clause' - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1077 end_line: 1097 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgpg-error0/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgpg-error0/copyright-detailed.expected.yml index edece5621b..5cf6e61e6f 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgpg-error0/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgpg-error0/copyright-detailed.expected.yml @@ -32,7 +32,7 @@ other_license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 57 end_line: 63 @@ -56,7 +56,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 65 end_line: 65 @@ -69,7 +69,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 66 end_line: 81 @@ -102,7 +102,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 83 end_line: 83 @@ -115,7 +115,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 84 end_line: 98 @@ -147,7 +147,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 101 end_line: 124 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgssapi-krb5-2/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgssapi-krb5-2/copyright-detailed.expected.yml index dd14f5bd9a..517fa91164 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgssapi-krb5-2/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgssapi-krb5-2/copyright-detailed.expected.yml @@ -26,7 +26,7 @@ license_detections: AND CC-BY-SA-3.0 matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 18 end_line: 39 @@ -61,7 +61,7 @@ license_detections: (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: generic-export-compliance - spdx_license_expression: LicenseRef-scancode-generic-export-compliance + license_expression_spdx: LicenseRef-scancode-generic-export-compliance from_file: start_line: 41 end_line: 52 @@ -86,7 +86,7 @@ license_detections: countries of Cuba, Iran, North Korea, Sudan, Syria, and residents and nationals of those countries. - license_expression: cc-by-sa-3.0 - spdx_license_expression: CC-BY-SA-3.0 + license_expression_spdx: CC-BY-SA-3.0 from_file: start_line: 54 end_line: 56 @@ -106,7 +106,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 64 end_line: 70 @@ -130,7 +130,7 @@ license_detections: license_expression_spdx: OpenVision matches: - license_expression: openvision - spdx_license_expression: OpenVision + license_expression_spdx: OpenVision from_file: start_line: 79 end_line: 111 @@ -180,7 +180,7 @@ license_detections: license_expression_spdx: HPND-export2-US matches: - license_expression: mit-no-advert-export-control - spdx_license_expression: HPND-export2-US + license_expression_spdx: HPND-export2-US from_file: start_line: 128 end_line: 146 @@ -216,7 +216,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause matches: - license_expression: brian-gladman-3-clause - spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause + license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause from_file: start_line: 156 end_line: 175 @@ -253,7 +253,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 187 end_line: 214 @@ -298,7 +298,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 222 end_line: 240 @@ -334,7 +334,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 248 end_line: 272 @@ -376,7 +376,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 334 end_line: 352 @@ -412,7 +412,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 363 end_line: 390 @@ -457,7 +457,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 400 end_line: 427 @@ -502,7 +502,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-michigan-disclaimer matches: - license_expression: michigan-disclaimer - spdx_license_expression: LicenseRef-scancode-michigan-disclaimer + license_expression_spdx: LicenseRef-scancode-michigan-disclaimer from_file: start_line: 440 end_line: 459 @@ -539,7 +539,7 @@ license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 469 end_line: 476 @@ -564,7 +564,7 @@ license_detections: license_expression_spdx: HPND-export2-US matches: - license_expression: mit-no-advert-export-control - spdx_license_expression: HPND-export2-US + license_expression_spdx: HPND-export2-US from_file: start_line: 485 end_line: 503 @@ -600,7 +600,7 @@ license_detections: license_expression_spdx: OLDAP-2.8 matches: - license_expression: openldap-2.8 - spdx_license_expression: OLDAP-2.8 + license_expression_spdx: OLDAP-2.8 from_file: start_line: 511 end_line: 558 @@ -665,7 +665,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 568 end_line: 595 @@ -710,7 +710,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 608 end_line: 636 @@ -756,7 +756,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 647 end_line: 675 @@ -802,7 +802,7 @@ license_detections: license_expression_spdx: BSD-2-Clause-first-lines matches: - license_expression: bsd-2-clause-first-lines - spdx_license_expression: BSD-2-Clause-first-lines + license_expression_spdx: BSD-2-Clause-first-lines from_file: start_line: 682 end_line: 705 @@ -843,7 +843,7 @@ license_detections: license_expression_spdx: MIT-CMU matches: - license_expression: cmu-uc - spdx_license_expression: MIT-CMU + license_expression_spdx: MIT-CMU from_file: start_line: 713 end_line: 729 @@ -877,7 +877,7 @@ license_detections: license_expression_spdx: CMU-Mach-nodoc matches: - license_expression: nrl-permission - spdx_license_expression: CMU-Mach-nodoc + license_expression_spdx: CMU-Mach-nodoc from_file: start_line: 735 end_line: 743 @@ -903,7 +903,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ietf-trust matches: - license_expression: ietf-trust - spdx_license_expression: LicenseRef-scancode-ietf-trust + license_expression_spdx: LicenseRef-scancode-ietf-trust from_file: start_line: 752 end_line: 763 @@ -932,7 +932,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-mit-old-style matches: - license_expression: mit-old-style - spdx_license_expression: LicenseRef-scancode-mit-old-style + license_expression_spdx: LicenseRef-scancode-mit-old-style from_file: start_line: 769 end_line: 776 @@ -957,7 +957,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 782 end_line: 800 @@ -993,7 +993,7 @@ license_detections: license_expression_spdx: BSD-2-Clause AND HPND-export-US-acknowledgement matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 810 end_line: 833 @@ -1030,7 +1030,7 @@ license_detections: OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: hpnd-export-us-acknowledgement - spdx_license_expression: HPND-export-US-acknowledgement + license_expression_spdx: HPND-export-US-acknowledgement from_file: start_line: 837 end_line: 856 @@ -1067,7 +1067,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 866 end_line: 899 @@ -1118,7 +1118,7 @@ license_detections: license_expression_spdx: HPND-export2-US matches: - license_expression: mit-no-advert-export-control - spdx_license_expression: HPND-export2-US + license_expression_spdx: HPND-export2-US from_file: start_line: 907 end_line: 922 @@ -1151,7 +1151,7 @@ license_detections: license_expression_spdx: BSD-4-Clause matches: - license_expression: bsd-original - spdx_license_expression: BSD-4-Clause + license_expression_spdx: BSD-4-Clause from_file: start_line: 934 end_line: 968 @@ -1203,7 +1203,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 978 end_line: 996 @@ -1239,7 +1239,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 1004 end_line: 1016 @@ -1269,7 +1269,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 1025 end_line: 1037 @@ -1299,7 +1299,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 1046 end_line: 1047 @@ -1318,7 +1318,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1060 end_line: 1087 @@ -1363,7 +1363,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-rsa-md4 matches: - license_expression: rsa-md4 - spdx_license_expression: LicenseRef-scancode-rsa-md4 + license_expression_spdx: LicenseRef-scancode-rsa-md4 from_file: start_line: 1096 end_line: 1112 @@ -1397,7 +1397,7 @@ license_detections: license_expression_spdx: RSA-MD matches: - license_expression: rsa-md5 - spdx_license_expression: RSA-MD + license_expression_spdx: RSA-MD from_file: start_line: 1121 end_line: 1137 @@ -1431,7 +1431,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-rsa-1990 matches: - license_expression: rsa-1990 - spdx_license_expression: LicenseRef-scancode-rsa-1990 + license_expression_spdx: LicenseRef-scancode-rsa-1990 from_file: start_line: 1147 end_line: 1153 @@ -1455,7 +1455,7 @@ license_detections: license_expression_spdx: HPND-export-US-modify matches: - license_expression: mit-with-modification-obligations - spdx_license_expression: HPND-export-US-modify + license_expression_spdx: HPND-export-US-modify from_file: start_line: 1163 end_line: 1181 @@ -1491,7 +1491,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1190 end_line: 1217 @@ -1536,7 +1536,7 @@ license_detections: license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later matches: - license_expression: bsd-simplified OR gpl-2.0-plus - spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later + license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later from_file: start_line: 1226 end_line: 1264 @@ -1592,7 +1592,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1274 end_line: 1302 @@ -1638,7 +1638,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1311 end_line: 1334 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libhogweed6/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libhogweed6/copyright-detailed.expected.yml index c3a4ccee6b..3b03648f2f 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libhogweed6/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libhogweed6/copyright-detailed.expected.yml @@ -197,7 +197,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 276 end_line: 276 @@ -210,7 +210,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 277 end_line: 293 @@ -244,7 +244,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-or-later WITH Texinfo-exception matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 489 end_line: 489 @@ -257,7 +257,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus WITH tex-exception - spdx_license_expression: GPL-3.0-or-later WITH Texinfo-exception + license_expression_spdx: GPL-3.0-or-later WITH Texinfo-exception from_file: start_line: 490 end_line: 505 @@ -290,7 +290,7 @@ other_license_detections: license_expression_spdx: Autoconf-exception-generic matches: - license_expression: autoconf-simple-exception-2.0 - spdx_license_expression: Autoconf-exception-generic + license_expression_spdx: Autoconf-exception-generic from_file: start_line: 525 end_line: 528 @@ -311,7 +311,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 533 end_line: 534 @@ -330,7 +330,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 539 end_line: 539 @@ -343,7 +343,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 540 end_line: 556 @@ -377,7 +377,7 @@ other_license_detections: license_expression_spdx: FSFAP-no-warranty-disclaimer matches: - license_expression: fsfap-no-warranty-disclaimer - spdx_license_expression: FSFAP-no-warranty-disclaimer + license_expression_spdx: FSFAP-no-warranty-disclaimer from_file: start_line: 565 end_line: 567 @@ -397,7 +397,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 569 end_line: 569 @@ -410,7 +410,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 570 end_line: 585 @@ -443,7 +443,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 587 end_line: 587 @@ -456,7 +456,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 588 end_line: 605 @@ -491,7 +491,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 608 end_line: 625 @@ -529,7 +529,7 @@ other_license_detections: AND MIT AND LicenseRef-scancode-pycrypto AND LGPL-2.1-or-later matches: - license_expression: (gpl-2.0-plus OR gpl-3.0-plus) AND other-permissive AND public-domain - spdx_license_expression: (GPL-2.0-or-later OR GPL-3.0-or-later) AND LicenseRef-scancode-other-permissive + license_expression_spdx: (GPL-2.0-or-later OR GPL-3.0-or-later) AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-public-domain from_file: start_line: 10 @@ -550,7 +550,7 @@ other_license_detections: find the current status of particular files, you have to read the copyright notices at the top of the files. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 47 end_line: 47 @@ -563,7 +563,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE matched_text: Released into the public domain. - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 55 end_line: 55 @@ -576,7 +576,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_515.RULE matched_text: released under the LGPL, version 2 or later. - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 60 end_line: 60 @@ -589,7 +589,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1090.RULE matched_text: It is released under the MIT license. - license_expression: pycrypto - spdx_license_expression: LicenseRef-scancode-pycrypto + license_expression_spdx: LicenseRef-scancode-pycrypto from_file: start_line: 64 end_line: 65 @@ -604,7 +604,7 @@ other_license_detections: Python Cryptography Toolkit license (essentially public domain). - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 69 end_line: 69 @@ -617,7 +617,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE matched_text: Released into the public domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 74 end_line: 74 @@ -630,7 +630,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE matched_text: Released into the public domain. - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 81 end_line: 82 @@ -645,7 +645,7 @@ other_license_detections: based on the code in libgcrypt, copyright owned by the Free Software Foundation. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 87 end_line: 87 @@ -658,7 +658,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_425.RULE matched_text: reference implementation (in the public domain), - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 92 end_line: 93 @@ -673,7 +673,7 @@ other_license_detections: based on the code in libgcrypt, copyright owned by the Free Software Foundation. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 105 end_line: 105 @@ -686,7 +686,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE matched_text: Released into the public domain. - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 106 end_line: 106 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libidn2-0/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libidn2-0/copyright-detailed.expected.yml index 4c41ca3ac8..08e84ecd95 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libidn2-0/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libidn2-0/copyright-detailed.expected.yml @@ -23,7 +23,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 28 end_line: 28 @@ -36,7 +36,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 29 end_line: 43 @@ -68,7 +68,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 45 end_line: 45 @@ -81,7 +81,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 46 end_line: 60 @@ -113,7 +113,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 62 end_line: 62 @@ -126,7 +126,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 63 end_line: 77 @@ -158,7 +158,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 80 end_line: 80 @@ -171,7 +171,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/unicode_14.RULE matched_text: For terms of use, see http://www.unicode.org/terms_of_use.html - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 81 end_line: 113 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libk5crypto3/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libk5crypto3/copyright-detailed.expected.yml index dd14f5bd9a..517fa91164 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libk5crypto3/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libk5crypto3/copyright-detailed.expected.yml @@ -26,7 +26,7 @@ license_detections: AND CC-BY-SA-3.0 matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 18 end_line: 39 @@ -61,7 +61,7 @@ license_detections: (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: generic-export-compliance - spdx_license_expression: LicenseRef-scancode-generic-export-compliance + license_expression_spdx: LicenseRef-scancode-generic-export-compliance from_file: start_line: 41 end_line: 52 @@ -86,7 +86,7 @@ license_detections: countries of Cuba, Iran, North Korea, Sudan, Syria, and residents and nationals of those countries. - license_expression: cc-by-sa-3.0 - spdx_license_expression: CC-BY-SA-3.0 + license_expression_spdx: CC-BY-SA-3.0 from_file: start_line: 54 end_line: 56 @@ -106,7 +106,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 64 end_line: 70 @@ -130,7 +130,7 @@ license_detections: license_expression_spdx: OpenVision matches: - license_expression: openvision - spdx_license_expression: OpenVision + license_expression_spdx: OpenVision from_file: start_line: 79 end_line: 111 @@ -180,7 +180,7 @@ license_detections: license_expression_spdx: HPND-export2-US matches: - license_expression: mit-no-advert-export-control - spdx_license_expression: HPND-export2-US + license_expression_spdx: HPND-export2-US from_file: start_line: 128 end_line: 146 @@ -216,7 +216,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause matches: - license_expression: brian-gladman-3-clause - spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause + license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause from_file: start_line: 156 end_line: 175 @@ -253,7 +253,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 187 end_line: 214 @@ -298,7 +298,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 222 end_line: 240 @@ -334,7 +334,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 248 end_line: 272 @@ -376,7 +376,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 334 end_line: 352 @@ -412,7 +412,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 363 end_line: 390 @@ -457,7 +457,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 400 end_line: 427 @@ -502,7 +502,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-michigan-disclaimer matches: - license_expression: michigan-disclaimer - spdx_license_expression: LicenseRef-scancode-michigan-disclaimer + license_expression_spdx: LicenseRef-scancode-michigan-disclaimer from_file: start_line: 440 end_line: 459 @@ -539,7 +539,7 @@ license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 469 end_line: 476 @@ -564,7 +564,7 @@ license_detections: license_expression_spdx: HPND-export2-US matches: - license_expression: mit-no-advert-export-control - spdx_license_expression: HPND-export2-US + license_expression_spdx: HPND-export2-US from_file: start_line: 485 end_line: 503 @@ -600,7 +600,7 @@ license_detections: license_expression_spdx: OLDAP-2.8 matches: - license_expression: openldap-2.8 - spdx_license_expression: OLDAP-2.8 + license_expression_spdx: OLDAP-2.8 from_file: start_line: 511 end_line: 558 @@ -665,7 +665,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 568 end_line: 595 @@ -710,7 +710,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 608 end_line: 636 @@ -756,7 +756,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 647 end_line: 675 @@ -802,7 +802,7 @@ license_detections: license_expression_spdx: BSD-2-Clause-first-lines matches: - license_expression: bsd-2-clause-first-lines - spdx_license_expression: BSD-2-Clause-first-lines + license_expression_spdx: BSD-2-Clause-first-lines from_file: start_line: 682 end_line: 705 @@ -843,7 +843,7 @@ license_detections: license_expression_spdx: MIT-CMU matches: - license_expression: cmu-uc - spdx_license_expression: MIT-CMU + license_expression_spdx: MIT-CMU from_file: start_line: 713 end_line: 729 @@ -877,7 +877,7 @@ license_detections: license_expression_spdx: CMU-Mach-nodoc matches: - license_expression: nrl-permission - spdx_license_expression: CMU-Mach-nodoc + license_expression_spdx: CMU-Mach-nodoc from_file: start_line: 735 end_line: 743 @@ -903,7 +903,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ietf-trust matches: - license_expression: ietf-trust - spdx_license_expression: LicenseRef-scancode-ietf-trust + license_expression_spdx: LicenseRef-scancode-ietf-trust from_file: start_line: 752 end_line: 763 @@ -932,7 +932,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-mit-old-style matches: - license_expression: mit-old-style - spdx_license_expression: LicenseRef-scancode-mit-old-style + license_expression_spdx: LicenseRef-scancode-mit-old-style from_file: start_line: 769 end_line: 776 @@ -957,7 +957,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 782 end_line: 800 @@ -993,7 +993,7 @@ license_detections: license_expression_spdx: BSD-2-Clause AND HPND-export-US-acknowledgement matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 810 end_line: 833 @@ -1030,7 +1030,7 @@ license_detections: OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: hpnd-export-us-acknowledgement - spdx_license_expression: HPND-export-US-acknowledgement + license_expression_spdx: HPND-export-US-acknowledgement from_file: start_line: 837 end_line: 856 @@ -1067,7 +1067,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 866 end_line: 899 @@ -1118,7 +1118,7 @@ license_detections: license_expression_spdx: HPND-export2-US matches: - license_expression: mit-no-advert-export-control - spdx_license_expression: HPND-export2-US + license_expression_spdx: HPND-export2-US from_file: start_line: 907 end_line: 922 @@ -1151,7 +1151,7 @@ license_detections: license_expression_spdx: BSD-4-Clause matches: - license_expression: bsd-original - spdx_license_expression: BSD-4-Clause + license_expression_spdx: BSD-4-Clause from_file: start_line: 934 end_line: 968 @@ -1203,7 +1203,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 978 end_line: 996 @@ -1239,7 +1239,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 1004 end_line: 1016 @@ -1269,7 +1269,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 1025 end_line: 1037 @@ -1299,7 +1299,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 1046 end_line: 1047 @@ -1318,7 +1318,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1060 end_line: 1087 @@ -1363,7 +1363,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-rsa-md4 matches: - license_expression: rsa-md4 - spdx_license_expression: LicenseRef-scancode-rsa-md4 + license_expression_spdx: LicenseRef-scancode-rsa-md4 from_file: start_line: 1096 end_line: 1112 @@ -1397,7 +1397,7 @@ license_detections: license_expression_spdx: RSA-MD matches: - license_expression: rsa-md5 - spdx_license_expression: RSA-MD + license_expression_spdx: RSA-MD from_file: start_line: 1121 end_line: 1137 @@ -1431,7 +1431,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-rsa-1990 matches: - license_expression: rsa-1990 - spdx_license_expression: LicenseRef-scancode-rsa-1990 + license_expression_spdx: LicenseRef-scancode-rsa-1990 from_file: start_line: 1147 end_line: 1153 @@ -1455,7 +1455,7 @@ license_detections: license_expression_spdx: HPND-export-US-modify matches: - license_expression: mit-with-modification-obligations - spdx_license_expression: HPND-export-US-modify + license_expression_spdx: HPND-export-US-modify from_file: start_line: 1163 end_line: 1181 @@ -1491,7 +1491,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1190 end_line: 1217 @@ -1536,7 +1536,7 @@ license_detections: license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later matches: - license_expression: bsd-simplified OR gpl-2.0-plus - spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later + license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later from_file: start_line: 1226 end_line: 1264 @@ -1592,7 +1592,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1274 end_line: 1302 @@ -1638,7 +1638,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1311 end_line: 1334 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkeyutils1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkeyutils1/copyright-detailed.expected.yml index 3031eef8ca..1b38f93849 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkeyutils1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkeyutils1/copyright-detailed.expected.yml @@ -16,7 +16,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 20 end_line: 20 @@ -29,7 +29,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 21 end_line: 35 @@ -61,7 +61,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 37 end_line: 37 @@ -74,7 +74,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 38 end_line: 52 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkrb5-3/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkrb5-3/copyright-detailed.expected.yml index dd14f5bd9a..517fa91164 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkrb5-3/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libkrb5-3/copyright-detailed.expected.yml @@ -26,7 +26,7 @@ license_detections: AND CC-BY-SA-3.0 matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 18 end_line: 39 @@ -61,7 +61,7 @@ license_detections: (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: generic-export-compliance - spdx_license_expression: LicenseRef-scancode-generic-export-compliance + license_expression_spdx: LicenseRef-scancode-generic-export-compliance from_file: start_line: 41 end_line: 52 @@ -86,7 +86,7 @@ license_detections: countries of Cuba, Iran, North Korea, Sudan, Syria, and residents and nationals of those countries. - license_expression: cc-by-sa-3.0 - spdx_license_expression: CC-BY-SA-3.0 + license_expression_spdx: CC-BY-SA-3.0 from_file: start_line: 54 end_line: 56 @@ -106,7 +106,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-proprietary-license matches: - license_expression: proprietary-license - spdx_license_expression: LicenseRef-scancode-proprietary-license + license_expression_spdx: LicenseRef-scancode-proprietary-license from_file: start_line: 64 end_line: 70 @@ -130,7 +130,7 @@ license_detections: license_expression_spdx: OpenVision matches: - license_expression: openvision - spdx_license_expression: OpenVision + license_expression_spdx: OpenVision from_file: start_line: 79 end_line: 111 @@ -180,7 +180,7 @@ license_detections: license_expression_spdx: HPND-export2-US matches: - license_expression: mit-no-advert-export-control - spdx_license_expression: HPND-export2-US + license_expression_spdx: HPND-export2-US from_file: start_line: 128 end_line: 146 @@ -216,7 +216,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause matches: - license_expression: brian-gladman-3-clause - spdx_license_expression: LicenseRef-scancode-brian-gladman-3-clause + license_expression_spdx: LicenseRef-scancode-brian-gladman-3-clause from_file: start_line: 156 end_line: 175 @@ -253,7 +253,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 187 end_line: 214 @@ -298,7 +298,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 222 end_line: 240 @@ -334,7 +334,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 248 end_line: 272 @@ -376,7 +376,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 334 end_line: 352 @@ -412,7 +412,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 363 end_line: 390 @@ -457,7 +457,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 400 end_line: 427 @@ -502,7 +502,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-michigan-disclaimer matches: - license_expression: michigan-disclaimer - spdx_license_expression: LicenseRef-scancode-michigan-disclaimer + license_expression_spdx: LicenseRef-scancode-michigan-disclaimer from_file: start_line: 440 end_line: 459 @@ -539,7 +539,7 @@ license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 469 end_line: 476 @@ -564,7 +564,7 @@ license_detections: license_expression_spdx: HPND-export2-US matches: - license_expression: mit-no-advert-export-control - spdx_license_expression: HPND-export2-US + license_expression_spdx: HPND-export2-US from_file: start_line: 485 end_line: 503 @@ -600,7 +600,7 @@ license_detections: license_expression_spdx: OLDAP-2.8 matches: - license_expression: openldap-2.8 - spdx_license_expression: OLDAP-2.8 + license_expression_spdx: OLDAP-2.8 from_file: start_line: 511 end_line: 558 @@ -665,7 +665,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 568 end_line: 595 @@ -710,7 +710,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 608 end_line: 636 @@ -756,7 +756,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 647 end_line: 675 @@ -802,7 +802,7 @@ license_detections: license_expression_spdx: BSD-2-Clause-first-lines matches: - license_expression: bsd-2-clause-first-lines - spdx_license_expression: BSD-2-Clause-first-lines + license_expression_spdx: BSD-2-Clause-first-lines from_file: start_line: 682 end_line: 705 @@ -843,7 +843,7 @@ license_detections: license_expression_spdx: MIT-CMU matches: - license_expression: cmu-uc - spdx_license_expression: MIT-CMU + license_expression_spdx: MIT-CMU from_file: start_line: 713 end_line: 729 @@ -877,7 +877,7 @@ license_detections: license_expression_spdx: CMU-Mach-nodoc matches: - license_expression: nrl-permission - spdx_license_expression: CMU-Mach-nodoc + license_expression_spdx: CMU-Mach-nodoc from_file: start_line: 735 end_line: 743 @@ -903,7 +903,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-ietf-trust matches: - license_expression: ietf-trust - spdx_license_expression: LicenseRef-scancode-ietf-trust + license_expression_spdx: LicenseRef-scancode-ietf-trust from_file: start_line: 752 end_line: 763 @@ -932,7 +932,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-mit-old-style matches: - license_expression: mit-old-style - spdx_license_expression: LicenseRef-scancode-mit-old-style + license_expression_spdx: LicenseRef-scancode-mit-old-style from_file: start_line: 769 end_line: 776 @@ -957,7 +957,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 782 end_line: 800 @@ -993,7 +993,7 @@ license_detections: license_expression_spdx: BSD-2-Clause AND HPND-export-US-acknowledgement matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 810 end_line: 833 @@ -1030,7 +1030,7 @@ license_detections: OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: hpnd-export-us-acknowledgement - spdx_license_expression: HPND-export-US-acknowledgement + license_expression_spdx: HPND-export-US-acknowledgement from_file: start_line: 837 end_line: 856 @@ -1067,7 +1067,7 @@ license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 866 end_line: 899 @@ -1118,7 +1118,7 @@ license_detections: license_expression_spdx: HPND-export2-US matches: - license_expression: mit-no-advert-export-control - spdx_license_expression: HPND-export2-US + license_expression_spdx: HPND-export2-US from_file: start_line: 907 end_line: 922 @@ -1151,7 +1151,7 @@ license_detections: license_expression_spdx: BSD-4-Clause matches: - license_expression: bsd-original - spdx_license_expression: BSD-4-Clause + license_expression_spdx: BSD-4-Clause from_file: start_line: 934 end_line: 968 @@ -1203,7 +1203,7 @@ license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 978 end_line: 996 @@ -1239,7 +1239,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 1004 end_line: 1016 @@ -1269,7 +1269,7 @@ license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 1025 end_line: 1037 @@ -1299,7 +1299,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive matches: - license_expression: other-permissive - spdx_license_expression: LicenseRef-scancode-other-permissive + license_expression_spdx: LicenseRef-scancode-other-permissive from_file: start_line: 1046 end_line: 1047 @@ -1318,7 +1318,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1060 end_line: 1087 @@ -1363,7 +1363,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-rsa-md4 matches: - license_expression: rsa-md4 - spdx_license_expression: LicenseRef-scancode-rsa-md4 + license_expression_spdx: LicenseRef-scancode-rsa-md4 from_file: start_line: 1096 end_line: 1112 @@ -1397,7 +1397,7 @@ license_detections: license_expression_spdx: RSA-MD matches: - license_expression: rsa-md5 - spdx_license_expression: RSA-MD + license_expression_spdx: RSA-MD from_file: start_line: 1121 end_line: 1137 @@ -1431,7 +1431,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-rsa-1990 matches: - license_expression: rsa-1990 - spdx_license_expression: LicenseRef-scancode-rsa-1990 + license_expression_spdx: LicenseRef-scancode-rsa-1990 from_file: start_line: 1147 end_line: 1153 @@ -1455,7 +1455,7 @@ license_detections: license_expression_spdx: HPND-export-US-modify matches: - license_expression: mit-with-modification-obligations - spdx_license_expression: HPND-export-US-modify + license_expression_spdx: HPND-export-US-modify from_file: start_line: 1163 end_line: 1181 @@ -1491,7 +1491,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1190 end_line: 1217 @@ -1536,7 +1536,7 @@ license_detections: license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later matches: - license_expression: bsd-simplified OR gpl-2.0-plus - spdx_license_expression: BSD-2-Clause OR GPL-2.0-or-later + license_expression_spdx: BSD-2-Clause OR GPL-2.0-or-later from_file: start_line: 1226 end_line: 1264 @@ -1592,7 +1592,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1274 end_line: 1302 @@ -1638,7 +1638,7 @@ license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 1311 end_line: 1334 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/liblz4-1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/liblz4-1/copyright-detailed.expected.yml index 77fff7073b..c9b1e7239e 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/liblz4-1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/liblz4-1/copyright-detailed.expected.yml @@ -32,7 +32,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 64 end_line: 64 @@ -45,7 +45,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 65 end_line: 70 @@ -68,7 +68,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 72 end_line: 72 @@ -81,7 +81,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 73 end_line: 79 @@ -105,7 +105,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 82 end_line: 101 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/liblzma5/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/liblzma5/copyright-detailed.expected.yml index 9cbdd94a93..ae30417350 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/liblzma5/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/liblzma5/copyright-detailed.expected.yml @@ -68,7 +68,7 @@ other_license_detections: AND (LGPL-2.1-only AND GPL-2.0-only AND GPL-3.0-only) matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 23 end_line: 23 @@ -81,7 +81,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_285.RULE matched_text: is in the public domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 25 end_line: 26 @@ -96,7 +96,7 @@ other_license_detections: command line tools are in the public domain - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 27 end_line: 28 @@ -111,7 +111,7 @@ other_license_detections: The getopt_long code is under GNU LGPLv2.1+. - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 31 end_line: 32 @@ -126,7 +126,7 @@ other_license_detections: These scripts and their documentation are under GNU GPLv2+. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 35 end_line: 36 @@ -141,7 +141,7 @@ other_license_detections: documentation files in other directories are in the public domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 38 end_line: 38 @@ -154,7 +154,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_429.RULE matched_text: Translated messages are in the public domain. - license_expression: public-domain AND gpl-2.0-plus AND gpl-3.0-plus - spdx_license_expression: LicenseRef-scancode-public-domain AND GPL-2.0-or-later AND + license_expression_spdx: LicenseRef-scancode-public-domain AND GPL-2.0-or-later AND GPL-3.0-or-later from_file: start_line: 40 @@ -170,7 +170,7 @@ other_license_detections: The build system contains public domain files, and files that are under GNU GPLv2+ or GNU GPLv3+. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 45 end_line: 45 @@ -183,7 +183,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_305.RULE matched_text: are in the public domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 47 end_line: 47 @@ -196,7 +196,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE matched_text: public domain - license_expression: other-permissive AND other-copyleft - spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft + license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft from_file: start_line: 47 end_line: 48 @@ -211,7 +211,7 @@ other_license_detections: files that are under various free software licenses. - license_expression: public-domain-disclaimer - spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 50 end_line: 64 @@ -239,7 +239,7 @@ other_license_detections: This software includes code from XZ Utils . - license_expression: lgpl-2.1 AND gpl-2.0 AND gpl-3.0 - spdx_license_expression: LGPL-2.1-only AND GPL-2.0-only AND GPL-3.0-only + license_expression_spdx: LGPL-2.1-only AND GPL-2.0-only AND GPL-3.0-only from_file: start_line: 66 end_line: 69 @@ -256,7 +256,7 @@ other_license_detections: - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 73 end_line: 73 @@ -269,7 +269,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_427.RULE matched_text: binary wouldn't actually be in the public domain in its entirety - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 12 end_line: 12 @@ -286,7 +286,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 90 end_line: 91 @@ -305,7 +305,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 120 end_line: 120 @@ -322,7 +322,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 136 end_line: 137 @@ -341,7 +341,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 142 end_line: 142 @@ -358,7 +358,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 180 end_line: 180 @@ -375,7 +375,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 185 end_line: 185 @@ -392,7 +392,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: '191' end_line: '192' @@ -411,7 +411,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 209 end_line: 209 @@ -428,7 +428,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 217 end_line: 217 @@ -446,7 +446,7 @@ other_license_detections: AND GPL-2.0-only matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 238 end_line: 239 @@ -461,7 +461,7 @@ other_license_detections: This file has been put into the public domain. # You can do whatever you want with this file. - license_expression: fsf-unlimited - spdx_license_expression: FSFULLR + license_expression_spdx: FSFULLR from_file: start_line: 244 end_line: 246 @@ -477,7 +477,7 @@ other_license_detections: dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. - license_expression: autoconf-exception-2.0 - spdx_license_expression: Autoconf-exception-2.0 + license_expression_spdx: Autoconf-exception-2.0 from_file: start_line: 257 end_line: 263 @@ -497,7 +497,7 @@ other_license_detections: # General Public License (GPL) does govern all other use of the material # that constitutes the Autoconf program. - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 265 end_line: 266 @@ -516,7 +516,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later AND (LGPL-2.0-only AND LGPL-2.1-only) matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 274 end_line: 274 @@ -529,7 +529,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.0 AND lgpl-2.1 - spdx_license_expression: LGPL-2.0-only AND LGPL-2.1-only + license_expression_spdx: LGPL-2.0-only AND LGPL-2.1-only from_file: start_line: 275 end_line: 281 @@ -553,7 +553,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-copyleft matches: - license_expression: other-copyleft - spdx_license_expression: LicenseRef-scancode-other-copyleft + license_expression_spdx: LicenseRef-scancode-other-copyleft from_file: start_line: 289 end_line: 290 @@ -572,7 +572,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 295 end_line: 296 @@ -591,7 +591,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 298 end_line: 298 @@ -604,7 +604,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 299 end_line: 314 @@ -637,7 +637,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 316 end_line: 316 @@ -650,7 +650,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 317 end_line: 329 @@ -680,7 +680,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 331 end_line: 331 @@ -693,7 +693,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 332 end_line: 347 @@ -726,7 +726,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-macro matches: - license_expression: gpl-3.0-plus WITH autoconf-macro-exception - spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-macro + license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-macro from_file: start_line: 350 end_line: 377 @@ -771,7 +771,7 @@ other_license_detections: license_expression_spdx: FSFULLR matches: - license_expression: fsf-unlimited - spdx_license_expression: FSFULLR + license_expression_spdx: FSFULLR from_file: start_line: 380 end_line: 382 @@ -791,7 +791,7 @@ other_license_detections: license_expression_spdx: FSFAP matches: - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 385 end_line: 388 @@ -812,7 +812,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 12 end_line: 12 @@ -829,7 +829,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 104 end_line: 104 @@ -842,7 +842,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_473.RULE matched_text: docs are in the public domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 108 end_line: 109 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libmount1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libmount1/copyright-detailed.expected.yml index bc7191dbd7..a6d4f5d7fd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libmount1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libmount1/copyright-detailed.expected.yml @@ -75,7 +75,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 345 end_line: 346 @@ -94,7 +94,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 350 end_line: 350 @@ -107,7 +107,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 351 end_line: 365 @@ -139,7 +139,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 367 end_line: 367 @@ -152,7 +152,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 368 end_line: 383 @@ -185,7 +185,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 385 end_line: 385 @@ -198,7 +198,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 386 end_line: 400 @@ -230,7 +230,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 403 end_line: 410 @@ -255,7 +255,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 413 end_line: 437 @@ -297,7 +297,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 440 end_line: 466 @@ -341,7 +341,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 468 end_line: 468 @@ -354,7 +354,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE matched_text: 'License: lgpl' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 469 end_line: 473 @@ -376,7 +376,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 475 end_line: 475 @@ -389,7 +389,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 476 end_line: 490 @@ -421,7 +421,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 492 end_line: 492 @@ -434,7 +434,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 493 end_line: 508 @@ -467,7 +467,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 510 end_line: 510 @@ -480,7 +480,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 511 end_line: 525 @@ -512,7 +512,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 528 end_line: 546 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnettle8/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnettle8/copyright-detailed.expected.yml index c3a4ccee6b..3b03648f2f 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnettle8/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnettle8/copyright-detailed.expected.yml @@ -197,7 +197,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 276 end_line: 276 @@ -210,7 +210,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 277 end_line: 293 @@ -244,7 +244,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later AND GPL-3.0-or-later WITH Texinfo-exception matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 489 end_line: 489 @@ -257,7 +257,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus WITH tex-exception - spdx_license_expression: GPL-3.0-or-later WITH Texinfo-exception + license_expression_spdx: GPL-3.0-or-later WITH Texinfo-exception from_file: start_line: 490 end_line: 505 @@ -290,7 +290,7 @@ other_license_detections: license_expression_spdx: Autoconf-exception-generic matches: - license_expression: autoconf-simple-exception-2.0 - spdx_license_expression: Autoconf-exception-generic + license_expression_spdx: Autoconf-exception-generic from_file: start_line: 525 end_line: 528 @@ -311,7 +311,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 533 end_line: 534 @@ -330,7 +330,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 539 end_line: 539 @@ -343,7 +343,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 540 end_line: 556 @@ -377,7 +377,7 @@ other_license_detections: license_expression_spdx: FSFAP-no-warranty-disclaimer matches: - license_expression: fsfap-no-warranty-disclaimer - spdx_license_expression: FSFAP-no-warranty-disclaimer + license_expression_spdx: FSFAP-no-warranty-disclaimer from_file: start_line: 565 end_line: 567 @@ -397,7 +397,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 569 end_line: 569 @@ -410,7 +410,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 570 end_line: 585 @@ -443,7 +443,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 587 end_line: 587 @@ -456,7 +456,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 588 end_line: 605 @@ -491,7 +491,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 608 end_line: 625 @@ -529,7 +529,7 @@ other_license_detections: AND MIT AND LicenseRef-scancode-pycrypto AND LGPL-2.1-or-later matches: - license_expression: (gpl-2.0-plus OR gpl-3.0-plus) AND other-permissive AND public-domain - spdx_license_expression: (GPL-2.0-or-later OR GPL-3.0-or-later) AND LicenseRef-scancode-other-permissive + license_expression_spdx: (GPL-2.0-or-later OR GPL-3.0-or-later) AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-public-domain from_file: start_line: 10 @@ -550,7 +550,7 @@ other_license_detections: find the current status of particular files, you have to read the copyright notices at the top of the files. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 47 end_line: 47 @@ -563,7 +563,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE matched_text: Released into the public domain. - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 55 end_line: 55 @@ -576,7 +576,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_515.RULE matched_text: released under the LGPL, version 2 or later. - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 60 end_line: 60 @@ -589,7 +589,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_1090.RULE matched_text: It is released under the MIT license. - license_expression: pycrypto - spdx_license_expression: LicenseRef-scancode-pycrypto + license_expression_spdx: LicenseRef-scancode-pycrypto from_file: start_line: 64 end_line: 65 @@ -604,7 +604,7 @@ other_license_detections: Python Cryptography Toolkit license (essentially public domain). - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 69 end_line: 69 @@ -617,7 +617,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE matched_text: Released into the public domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 74 end_line: 74 @@ -630,7 +630,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE matched_text: Released into the public domain. - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 81 end_line: 82 @@ -645,7 +645,7 @@ other_license_detections: based on the code in libgcrypt, copyright owned by the Free Software Foundation. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 87 end_line: 87 @@ -658,7 +658,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_425.RULE matched_text: reference implementation (in the public domain), - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 92 end_line: 93 @@ -673,7 +673,7 @@ other_license_detections: based on the code in libgcrypt, copyright owned by the Free Software Foundation. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 105 end_line: 105 @@ -686,7 +686,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_15.RULE matched_text: Released into the public domain. - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 106 end_line: 106 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnsl2/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnsl2/copyright-detailed.expected.yml index d1e29d4f10..8e39b7d093 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnsl2/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libnsl2/copyright-detailed.expected.yml @@ -42,7 +42,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 171 end_line: '196' @@ -85,7 +85,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later WITH Autoconf-exception-generic matches: - license_expression: gpl-2.0-plus WITH autoconf-simple-exception-2.0 - spdx_license_expression: GPL-2.0-or-later WITH Autoconf-exception-generic + license_expression_spdx: GPL-2.0-or-later WITH Autoconf-exception-generic from_file: start_line: '199' end_line: 218 @@ -122,7 +122,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception matches: - license_expression: gpl-2.0-plus WITH libtool-exception-2.0 - spdx_license_expression: GPL-2.0-or-later WITH Libtool-exception + license_expression_spdx: GPL-2.0-or-later WITH Libtool-exception from_file: start_line: 221 end_line: 240 @@ -159,7 +159,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 matches: - license_expression: gpl-3.0-plus WITH autoconf-simple-exception - spdx_license_expression: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 + license_expression_spdx: GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 from_file: start_line: 243 end_line: 264 @@ -198,7 +198,7 @@ license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 266 end_line: 266 @@ -211,7 +211,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 267 end_line: 280 @@ -242,7 +242,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 282 end_line: 282 @@ -255,7 +255,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 283 end_line: 298 @@ -288,7 +288,7 @@ license_detections: license_expression_spdx: X11 matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: 301 end_line: 321 @@ -326,7 +326,7 @@ license_detections: license_expression_spdx: FSFULLR matches: - license_expression: fsf-unlimited - spdx_license_expression: FSFULLR + license_expression_spdx: FSFULLR from_file: start_line: 324 end_line: 326 @@ -346,7 +346,7 @@ license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 329 end_line: 336 @@ -371,7 +371,7 @@ license_detections: license_expression_spdx: FSFUL matches: - license_expression: fsf-free - spdx_license_expression: FSFUL + license_expression_spdx: FSFUL from_file: start_line: 339 end_line: 340 @@ -390,7 +390,7 @@ license_detections: license_expression_spdx: FSFAP matches: - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 343 end_line: 346 @@ -411,7 +411,7 @@ license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 349 end_line: 356 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libp11-kit0/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libp11-kit0/copyright-detailed.expected.yml index 194c513580..eecf048a4b 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libp11-kit0/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libp11-kit0/copyright-detailed.expected.yml @@ -27,7 +27,7 @@ other_license_detections: license_expression_spdx: FSFULLRWD matches: - license_expression: fsf-unlimited-no-warranty - spdx_license_expression: FSFULLRWD + license_expression_spdx: FSFULLRWD from_file: start_line: 17 end_line: 24 @@ -52,7 +52,7 @@ other_license_detections: license_expression_spdx: ISC matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 61 end_line: 71 @@ -80,7 +80,7 @@ other_license_detections: license_expression_spdx: ISC AND LicenseRef-scancode-ibm-dhcp matches: - license_expression: isc - spdx_license_expression: ISC + license_expression_spdx: ISC from_file: start_line: 80 end_line: 91 @@ -105,7 +105,7 @@ other_license_detections: ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - license_expression: ibm-dhcp - spdx_license_expression: LicenseRef-scancode-ibm-dhcp + license_expression_spdx: LicenseRef-scancode-ibm-dhcp from_file: start_line: 96 end_line: 115 @@ -142,7 +142,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-free-unknown matches: - license_expression: free-unknown - spdx_license_expression: LicenseRef-scancode-free-unknown + license_expression_spdx: LicenseRef-scancode-free-unknown from_file: start_line: 160 end_line: 160 @@ -159,7 +159,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 165 end_line: 187 @@ -199,7 +199,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 46 end_line: 55 @@ -226,7 +226,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 151 end_line: 152 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpam-modules/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpam-modules/copyright-detailed.expected.yml index c5c5b32552..8b7e60c9cf 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpam-modules/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpam-modules/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: (BSD-3-Clause OR LGPL-2.0-or-later) AND GPL-1.0-or-later matches: - license_expression: bsd-new OR lgpl-2.0-plus - spdx_license_expression: BSD-3-Clause OR LGPL-2.0-or-later + license_expression_spdx: BSD-3-Clause OR LGPL-2.0-or-later from_file: start_line: 25 end_line: 63 @@ -60,7 +60,7 @@ license_detections: USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 66 end_line: 67 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpcre2-8-0/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpcre2-8-0/copyright-detailed.expected.yml index 4d9a5b4af8..fb5f1ccecf 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpcre2-8-0/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpcre2-8-0/copyright-detailed.expected.yml @@ -9,7 +9,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-pcre matches: - license_expression: pcre - spdx_license_expression: LicenseRef-scancode-pcre + license_expression_spdx: LicenseRef-scancode-pcre from_file: start_line: 3 end_line: 5 @@ -29,7 +29,7 @@ license_detections: license_expression_spdx: BSD-3-Clause AND LicenseRef-scancode-public-domain matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 11 end_line: 11 @@ -42,7 +42,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_398.RULE matched_text: distributed under the terms of the "BSD" licence, - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 14 end_line: 14 @@ -59,7 +59,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 58 end_line: 58 @@ -72,7 +72,7 @@ license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_898.RULE matched_text: THE "BSD" LICENCE - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 61 end_line: 85 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpcre3/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpcre3/copyright-detailed.expected.yml index d9d7c81a8a..c751b66a6f 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpcre3/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libpcre3/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LicenseRef-scancode-pcre matches: - license_expression: pcre - spdx_license_expression: LicenseRef-scancode-pcre + license_expression_spdx: LicenseRef-scancode-pcre from_file: start_line: 7 end_line: 7 @@ -25,7 +25,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 13 end_line: 15 @@ -45,7 +45,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 44 end_line: 72 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libseccomp2/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libseccomp2/copyright-detailed.expected.yml index 5589719818..2f6a55d891 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libseccomp2/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libseccomp2/copyright-detailed.expected.yml @@ -16,7 +16,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 25 end_line: 25 @@ -29,7 +29,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 26 end_line: 39 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libselinux1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libselinux1/copyright-detailed.expected.yml index 7558a1fa6d..1bd0568e91 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libselinux1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libselinux1/copyright-detailed.expected.yml @@ -9,7 +9,7 @@ license_detections: license_expression_spdx: libselinux-1.0 matches: - license_expression: selinux-nsa-declaration-1.0 - spdx_license_expression: libselinux-1.0 + license_expression_spdx: libselinux-1.0 from_file: start_line: 7 end_line: 27 @@ -47,7 +47,7 @@ license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 32 end_line: 33 @@ -66,7 +66,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 38 end_line: 50 @@ -96,7 +96,7 @@ license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 56 end_line: 65 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsemanage-common/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsemanage-common/copyright-detailed.expected.yml index a59497d7e1..3c2185adb4 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsemanage-common/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsemanage-common/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 7 end_line: 22 @@ -41,7 +41,7 @@ license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 27 end_line: 36 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsepol1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsepol1/copyright-detailed.expected.yml index 05bcf87645..3e878b6358 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsepol1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsepol1/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later AND GPL-2.0-only matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 16 end_line: 41 @@ -47,7 +47,7 @@ license_detections: On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/ - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 36 end_line: 46 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsmartcols1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsmartcols1/copyright-detailed.expected.yml index bc7191dbd7..a6d4f5d7fd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsmartcols1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsmartcols1/copyright-detailed.expected.yml @@ -75,7 +75,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 345 end_line: 346 @@ -94,7 +94,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 350 end_line: 350 @@ -107,7 +107,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 351 end_line: 365 @@ -139,7 +139,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 367 end_line: 367 @@ -152,7 +152,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 368 end_line: 383 @@ -185,7 +185,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 385 end_line: 385 @@ -198,7 +198,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 386 end_line: 400 @@ -230,7 +230,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 403 end_line: 410 @@ -255,7 +255,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 413 end_line: 437 @@ -297,7 +297,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 440 end_line: 466 @@ -341,7 +341,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 468 end_line: 468 @@ -354,7 +354,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE matched_text: 'License: lgpl' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 469 end_line: 473 @@ -376,7 +376,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 475 end_line: 475 @@ -389,7 +389,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 476 end_line: 490 @@ -421,7 +421,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 492 end_line: 492 @@ -434,7 +434,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 493 end_line: 508 @@ -467,7 +467,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 510 end_line: 510 @@ -480,7 +480,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 511 end_line: 525 @@ -512,7 +512,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 528 end_line: 546 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libss2/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libss2/copyright-detailed.expected.yml index 820a1963ad..cc0d6ef0e0 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libss2/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libss2/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: NTP matches: - license_expression: mit-old-style-no-advert - spdx_license_expression: NTP + license_expression_spdx: NTP from_file: start_line: 15 end_line: 25 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libssl1.1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libssl1.1/copyright-detailed.expected.yml index 38b2fab787..f39212ffd6 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libssl1.1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libssl1.1/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: OpenSSL matches: - license_expression: openssl-ssleay - spdx_license_expression: OpenSSL + license_expression_spdx: OpenSSL from_file: start_line: 10 end_line: 133 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsystemd0/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsystemd0/copyright-detailed.expected.yml index 8facace882..b1c5959e1a 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsystemd0/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libsystemd0/copyright-detailed.expected.yml @@ -30,7 +30,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer matches: - license_expression: public-domain-disclaimer - spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 77 end_line: 78 @@ -49,7 +49,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 150 end_line: 166 @@ -83,7 +83,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 168 end_line: 168 @@ -96,7 +96,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 169 end_line: 184 @@ -129,7 +129,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only WITH Linux-syscall-note matches: - license_expression: gpl-2.0 WITH linux-syscall-exception-gpl - spdx_license_expression: GPL-2.0-only WITH Linux-syscall-note + license_expression_spdx: GPL-2.0-only WITH Linux-syscall-note from_file: start_line: 187 end_line: 215 @@ -175,7 +175,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 217 end_line: 217 @@ -188,7 +188,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 218 end_line: 233 @@ -221,7 +221,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 235 end_line: 235 @@ -234,7 +234,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 236 end_line: 251 @@ -267,7 +267,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 253 end_line: 253 @@ -280,7 +280,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE matched_text: 'License: cc0-1.0' - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 254 end_line: 262 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtasn1-6/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtasn1-6/copyright-detailed.expected.yml index 8ab12a267f..a4ac64e299 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtasn1-6/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtasn1-6/copyright-detailed.expected.yml @@ -10,7 +10,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later AND GPL-3.0-or-later matches: - license_expression: lgpl-2.1-plus AND gpl-3.0-plus - spdx_license_expression: LGPL-2.1-or-later AND GPL-3.0-or-later + license_expression_spdx: LGPL-2.1-or-later AND GPL-3.0-or-later from_file: start_line: 14 end_line: 15 @@ -29,7 +29,7 @@ license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 23 end_line: 42 @@ -66,7 +66,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later AND GFDL-1.3-only AND GFDL-1.3-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 50 end_line: 70 @@ -100,7 +100,7 @@ license_detections: The documentation is distributed under the terms of the GNU Free Documentation License ( - license_expression: gfdl-1.3 - spdx_license_expression: GFDL-1.3-only + license_expression_spdx: GFDL-1.3-only from_file: start_line: 69 end_line: 70 @@ -115,7 +115,7 @@ license_detections: The documentation is distributed under the terms of the GNU Free Documentation License (FDL 1.3): - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: 74 end_line: 83 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtinfo6/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtinfo6/copyright-detailed.expected.yml index c8951da13e..98301bd010 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtinfo6/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtinfo6/copyright-detailed.expected.yml @@ -15,7 +15,7 @@ other_license_detections: license_expression_spdx: X11-distribute-modifications-variant matches: - license_expression: x11-fsf - spdx_license_expression: X11-distribute-modifications-variant + license_expression_spdx: X11-distribute-modifications-variant from_file: start_line: 22 end_line: 44 @@ -55,7 +55,7 @@ other_license_detections: license_expression_spdx: X11 matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: 47 end_line: 67 @@ -93,7 +93,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 70 end_line: 92 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtirpc-common/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtirpc-common/copyright-detailed.expected.yml index 3342cccc69..af1cc4c0df 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtirpc-common/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libtirpc-common/copyright-detailed.expected.yml @@ -62,7 +62,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-free-unknown matches: - license_expression: other-permissive AND free-unknown - spdx_license_expression: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-free-unknown + license_expression_spdx: LicenseRef-scancode-other-permissive AND LicenseRef-scancode-free-unknown from_file: start_line: 105 end_line: 105 @@ -79,7 +79,7 @@ other_license_detections: license_expression_spdx: FSFAP matches: - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 164 end_line: 167 @@ -100,7 +100,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 268 end_line: 289 @@ -139,7 +139,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 292 end_line: 311 @@ -176,7 +176,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause matches: - license_expression: bsd-original - spdx_license_expression: BSD-4-Clause + license_expression_spdx: BSD-4-Clause from_file: start_line: 314 end_line: 339 @@ -219,7 +219,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 341 end_line: 341 @@ -232,7 +232,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 342 end_line: 348 @@ -256,7 +256,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 350 end_line: 350 @@ -269,7 +269,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 351 end_line: 365 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libudev1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libudev1/copyright-detailed.expected.yml index 8facace882..b1c5959e1a 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libudev1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libudev1/copyright-detailed.expected.yml @@ -30,7 +30,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer matches: - license_expression: public-domain-disclaimer - spdx_license_expression: LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 77 end_line: 78 @@ -49,7 +49,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 150 end_line: 166 @@ -83,7 +83,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 168 end_line: 168 @@ -96,7 +96,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 169 end_line: 184 @@ -129,7 +129,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only WITH Linux-syscall-note matches: - license_expression: gpl-2.0 WITH linux-syscall-exception-gpl - spdx_license_expression: GPL-2.0-only WITH Linux-syscall-note + license_expression_spdx: GPL-2.0-only WITH Linux-syscall-note from_file: start_line: 187 end_line: 215 @@ -175,7 +175,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 217 end_line: 217 @@ -188,7 +188,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 218 end_line: 233 @@ -221,7 +221,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 235 end_line: 235 @@ -234,7 +234,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 236 end_line: 251 @@ -267,7 +267,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 253 end_line: 253 @@ -280,7 +280,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE matched_text: 'License: cc0-1.0' - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 254 end_line: 262 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libunistring2/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libunistring2/copyright-detailed.expected.yml index b18f48e091..8698bd19f2 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libunistring2/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libunistring2/copyright-detailed.expected.yml @@ -31,7 +31,7 @@ other_license_detections: license_expression_spdx: FSFULLR matches: - license_expression: fsf-unlimited - spdx_license_expression: FSFULLR + license_expression_spdx: FSFULLR from_file: start_line: 13 end_line: 15 @@ -51,7 +51,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later WITH Autoconf-exception-generic matches: - license_expression: gpl-1.0-plus WITH autoconf-simple-exception-2.0 - spdx_license_expression: GPL-1.0-or-later WITH Autoconf-exception-generic + license_expression_spdx: GPL-1.0-or-later WITH Autoconf-exception-generic from_file: start_line: 21 end_line: 25 @@ -73,7 +73,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 54 end_line: 54 @@ -86,7 +86,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 55 end_line: 70 @@ -119,7 +119,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 72 end_line: 72 @@ -132,7 +132,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 73 end_line: 88 @@ -165,7 +165,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 90 end_line: 90 @@ -178,7 +178,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 91 end_line: 108 @@ -213,7 +213,7 @@ other_license_detections: license_expression_spdx: GFDL-1.2-or-later matches: - license_expression: gfdl-1.2-plus - spdx_license_expression: GFDL-1.2-or-later + license_expression_spdx: GFDL-1.2-or-later from_file: start_line: 110 end_line: 110 @@ -226,7 +226,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/debian_common_gfdl-1.2-plus.RULE matched_text: 'License: gfdl-1.2+' - license_expression: gfdl-1.2-plus - spdx_license_expression: GFDL-1.2-or-later + license_expression_spdx: GFDL-1.2-or-later from_file: start_line: 111 end_line: 120 @@ -253,7 +253,7 @@ other_license_detections: license_expression_spdx: X11 matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: 123 end_line: 143 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libuuid1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libuuid1/copyright-detailed.expected.yml index bc7191dbd7..a6d4f5d7fd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libuuid1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libuuid1/copyright-detailed.expected.yml @@ -75,7 +75,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 345 end_line: 346 @@ -94,7 +94,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 350 end_line: 350 @@ -107,7 +107,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 351 end_line: 365 @@ -139,7 +139,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 367 end_line: 367 @@ -152,7 +152,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 368 end_line: 383 @@ -185,7 +185,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 385 end_line: 385 @@ -198,7 +198,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 386 end_line: 400 @@ -230,7 +230,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 403 end_line: 410 @@ -255,7 +255,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 413 end_line: 437 @@ -297,7 +297,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 440 end_line: 466 @@ -341,7 +341,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 468 end_line: 468 @@ -354,7 +354,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE matched_text: 'License: lgpl' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 469 end_line: 473 @@ -376,7 +376,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 475 end_line: 475 @@ -389,7 +389,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 476 end_line: 490 @@ -421,7 +421,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 492 end_line: 492 @@ -434,7 +434,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 493 end_line: 508 @@ -467,7 +467,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 510 end_line: 510 @@ -480,7 +480,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 511 end_line: 525 @@ -512,7 +512,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 528 end_line: 546 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libxxhash0/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libxxhash0/copyright-detailed.expected.yml index 6f3b870c07..a251079df9 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libxxhash0/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libxxhash0/copyright-detailed.expected.yml @@ -15,7 +15,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 20 end_line: 39 @@ -52,7 +52,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only AND GPL-2.0-or-later matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 41 end_line: 41 @@ -65,7 +65,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 42 end_line: 57 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libzstd1/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libzstd1/copyright-detailed.expected.yml index ed7883a267..612bb17b7e 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libzstd1/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libzstd1/copyright-detailed.expected.yml @@ -21,7 +21,7 @@ other_license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 30 end_line: 44 @@ -53,7 +53,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 59 end_line: 77 @@ -89,7 +89,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 79 end_line: 79 @@ -102,7 +102,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 80 end_line: 94 @@ -134,7 +134,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 97 end_line: 117 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/login/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/login/copyright-detailed.expected.yml index be0e8f0c90..a53b33c3d9 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/login/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/login/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 20 end_line: 42 @@ -48,7 +48,7 @@ license_detections: license_expression_spdx: TCP-wrappers matches: - license_expression: tcp-wrappers - spdx_license_expression: TCP-wrappers + license_expression_spdx: TCP-wrappers from_file: start_line: 72 end_line: 85 @@ -72,7 +72,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 92 end_line: 103 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/logsave/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/logsave/copyright-detailed.expected.yml index 43de122800..881eeb6a0d 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/logsave/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/logsave/copyright-detailed.expected.yml @@ -10,7 +10,7 @@ license_detections: license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP matches: - license_expression: gpl-2.0 AND lgpl-2.0 AND bsd-new AND mit-old-style-no-advert - spdx_license_expression: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP + license_expression_spdx: GPL-2.0-only AND LGPL-2.0-only AND BSD-3-Clause AND NTP from_file: start_line: 17 end_line: 30 @@ -35,7 +35,7 @@ license_detections: license_expression_spdx: NTP-0 AND BSD-3-Clause matches: - license_expression: ntp-0 - spdx_license_expression: NTP-0 + license_expression_spdx: NTP-0 from_file: start_line: 38 end_line: 45 @@ -56,7 +56,7 @@ license_detections: this software for any purpose. It is provided "as is" without express or implied warranty. - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 49 end_line: 73 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/lsb-base/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/lsb-base/copyright-detailed.expected.yml index 5de46cb8e8..f475a5913c 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/lsb-base/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/lsb-base/copyright-detailed.expected.yml @@ -14,7 +14,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 15 end_line: 37 @@ -54,7 +54,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 39 end_line: 39 @@ -67,7 +67,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 40 end_line: 58 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/mawk/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/mawk/copyright-detailed.expected.yml index ec5f03ae9c..51bacc8ee0 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/mawk/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/mawk/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: '19' end_line: 32 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/mount/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/mount/copyright-detailed.expected.yml index bc7191dbd7..a6d4f5d7fd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/mount/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/mount/copyright-detailed.expected.yml @@ -75,7 +75,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 345 end_line: 346 @@ -94,7 +94,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 350 end_line: 350 @@ -107,7 +107,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 351 end_line: 365 @@ -139,7 +139,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 367 end_line: 367 @@ -152,7 +152,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 368 end_line: 383 @@ -185,7 +185,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 385 end_line: 385 @@ -198,7 +198,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 386 end_line: 400 @@ -230,7 +230,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 403 end_line: 410 @@ -255,7 +255,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 413 end_line: 437 @@ -297,7 +297,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 440 end_line: 466 @@ -341,7 +341,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 468 end_line: 468 @@ -354,7 +354,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE matched_text: 'License: lgpl' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 469 end_line: 473 @@ -376,7 +376,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 475 end_line: 475 @@ -389,7 +389,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 476 end_line: 490 @@ -421,7 +421,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 492 end_line: 492 @@ -434,7 +434,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 493 end_line: 508 @@ -467,7 +467,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 510 end_line: 510 @@ -480,7 +480,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 511 end_line: 525 @@ -512,7 +512,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 528 end_line: 546 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/ncurses-base/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/ncurses-base/copyright-detailed.expected.yml index c8951da13e..98301bd010 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/ncurses-base/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/ncurses-base/copyright-detailed.expected.yml @@ -15,7 +15,7 @@ other_license_detections: license_expression_spdx: X11-distribute-modifications-variant matches: - license_expression: x11-fsf - spdx_license_expression: X11-distribute-modifications-variant + license_expression_spdx: X11-distribute-modifications-variant from_file: start_line: 22 end_line: 44 @@ -55,7 +55,7 @@ other_license_detections: license_expression_spdx: X11 matches: - license_expression: x11-xconsortium - spdx_license_expression: X11 + license_expression_spdx: X11 from_file: start_line: 47 end_line: 67 @@ -93,7 +93,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 70 end_line: 92 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/passwd/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/passwd/copyright-detailed.expected.yml index be0e8f0c90..a53b33c3d9 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/passwd/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/passwd/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 20 end_line: 42 @@ -48,7 +48,7 @@ license_detections: license_expression_spdx: TCP-wrappers matches: - license_expression: tcp-wrappers - spdx_license_expression: TCP-wrappers + license_expression_spdx: TCP-wrappers from_file: start_line: 72 end_line: 85 @@ -72,7 +72,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 92 end_line: 103 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/perl-base/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/perl-base/copyright-detailed.expected.yml index 26870fc373..88c2e184c7 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/perl-base/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/perl-base/copyright-detailed.expected.yml @@ -704,7 +704,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-only matches: - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 2025 end_line: 2025 @@ -717,7 +717,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1_38.RULE matched_text: 'License: lgpl-2.1' - license_expression: lgpl-2.1 - spdx_license_expression: LGPL-2.1-only + license_expression_spdx: LGPL-2.1-only from_file: start_line: 2026 end_line: 2027 @@ -736,7 +736,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later AND GPL-1.0-only matches: - license_expression: gpl-1.0-plus - spdx_license_expression: GPL-1.0-or-later + license_expression_spdx: GPL-1.0-or-later from_file: start_line: 2029 end_line: 2029 @@ -749,7 +749,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-1.0-plus_395.RULE matched_text: 'License: gpl-1+' - license_expression: gpl-1.0 - spdx_license_expression: GPL-1.0-only + license_expression_spdx: GPL-1.0-only from_file: start_line: 2030 end_line: 2031 @@ -768,7 +768,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later AND GPL-2.0-only matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 2033 end_line: 2033 @@ -781,7 +781,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 2034 end_line: 2036 @@ -801,7 +801,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl matches: - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 2038 end_line: 2038 @@ -814,7 +814,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/artistic-perl-1.0_26.RULE matched_text: 'License: artistic' - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 2039 end_line: 2040 @@ -833,7 +833,7 @@ other_license_detections: license_expression_spdx: Artistic-2.0 matches: - license_expression: artistic-2.0 - spdx_license_expression: Artistic-2.0 + license_expression_spdx: Artistic-2.0 from_file: start_line: 2043 end_line: 2224 @@ -1032,7 +1032,7 @@ other_license_detections: license_expression_spdx: bzip2-1.0.6 matches: - license_expression: bzip2-libbzip-2010 - spdx_license_expression: bzip2-1.0.6 + license_expression_spdx: bzip2-1.0.6 from_file: start_line: 2227 end_line: 2256 @@ -1079,7 +1079,7 @@ other_license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 2262 end_line: 2276 @@ -1111,7 +1111,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 2279 end_line: 2295 @@ -1145,7 +1145,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 2298 end_line: 2320 @@ -1185,7 +1185,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause matches: - license_expression: bsd-original - spdx_license_expression: BSD-4-Clause + license_expression_spdx: BSD-4-Clause from_file: start_line: 2323 end_line: 2349 @@ -1229,7 +1229,7 @@ other_license_detections: license_expression_spdx: Unicode-DFS-2015 matches: - license_expression: unicode-dfs-2015 - spdx_license_expression: Unicode-DFS-2015 + license_expression_spdx: Unicode-DFS-2015 from_file: start_line: 2353 end_line: 2407 @@ -1301,7 +1301,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 2410 end_line: 2432 @@ -1341,7 +1341,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 2435 end_line: 2457 @@ -1381,7 +1381,7 @@ other_license_detections: license_expression_spdx: Spencer-86 matches: - license_expression: regexp - spdx_license_expression: Spencer-86 + license_expression_spdx: Spencer-86 from_file: start_line: 2460 end_line: 2472 @@ -1411,7 +1411,7 @@ other_license_detections: license_expression_spdx: TTWL matches: - license_expression: ttwl - spdx_license_expression: TTWL + license_expression_spdx: TTWL from_file: start_line: 2475 end_line: 2479 @@ -1433,7 +1433,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-other-copyleft matches: - license_expression: other-copyleft - spdx_license_expression: LicenseRef-scancode-other-copyleft + license_expression_spdx: LicenseRef-scancode-other-copyleft from_file: start_line: 2482 end_line: 2483 @@ -1452,7 +1452,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 2489 end_line: 2489 @@ -1465,7 +1465,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_45.RULE matched_text: placed in the public domain. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 2494 end_line: 2494 @@ -1478,7 +1478,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_285.RULE matched_text: is in the public domain, - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 2495 end_line: 2495 @@ -1491,7 +1491,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE matched_text: public-domain - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 2504 end_line: 2504 @@ -1508,7 +1508,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2 matches: - license_expression: gpl-3.0-plus WITH bison-exception-2.2 - spdx_license_expression: GPL-3.0-or-later WITH Bison-exception-2.2 + license_expression_spdx: GPL-3.0-or-later WITH Bison-exception-2.2 from_file: start_line: 2508 end_line: 2532 @@ -1550,7 +1550,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-paul-hsieh-derivative matches: - license_expression: paul-hsieh-derivative - spdx_license_expression: LicenseRef-scancode-paul-hsieh-derivative + license_expression_spdx: LicenseRef-scancode-paul-hsieh-derivative from_file: start_line: 2535 end_line: 2550 @@ -1583,7 +1583,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-bsd-x11 matches: - license_expression: bsd-x11 - spdx_license_expression: LicenseRef-scancode-bsd-x11 + license_expression_spdx: LicenseRef-scancode-bsd-x11 from_file: start_line: 2556 end_line: 2581 @@ -1626,7 +1626,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 2583 end_line: 2583 @@ -1639,7 +1639,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/cc0-1.0_12.RULE matched_text: 'License: cc0-1.0' - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 2584 end_line: 2703 @@ -1776,7 +1776,7 @@ other_license_detections: license_expression_spdx: FSFAP matches: - license_expression: fsf-ap - spdx_license_expression: FSFAP + license_expression_spdx: FSFAP from_file: start_line: 2710 end_line: 2713 @@ -1797,7 +1797,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 matches: - license_expression: artistic-dist-1.0 - spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0 + license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 from_file: start_line: 2716 end_line: 2840 @@ -1939,7 +1939,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 22 end_line: 29 @@ -1964,7 +1964,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 49 end_line: 49 @@ -1981,7 +1981,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 56 end_line: 56 @@ -1998,7 +1998,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 64 end_line: 64 @@ -2015,7 +2015,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 74 end_line: 74 @@ -2032,7 +2032,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 105 end_line: 106 @@ -2051,7 +2051,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 118 end_line: 119 @@ -2070,7 +2070,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 147 end_line: 147 @@ -2087,7 +2087,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 157 end_line: 159 @@ -2107,7 +2107,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 167 end_line: 168 @@ -2126,7 +2126,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 175 end_line: 176 @@ -2145,7 +2145,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 183 end_line: 183 @@ -2162,7 +2162,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: '190' end_line: '190' @@ -2179,7 +2179,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: '198' end_line: '198' @@ -2196,7 +2196,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 208 end_line: 209 @@ -2215,7 +2215,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 223 end_line: 224 @@ -2234,7 +2234,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 233 end_line: 234 @@ -2253,7 +2253,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 241 end_line: 242 @@ -2272,7 +2272,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 249 end_line: 250 @@ -2291,7 +2291,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 257 end_line: 258 @@ -2310,7 +2310,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 267 end_line: 268 @@ -2329,7 +2329,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 275 end_line: 275 @@ -2346,7 +2346,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 309 end_line: 310 @@ -2365,7 +2365,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 316 end_line: 317 @@ -2384,7 +2384,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 330 end_line: 330 @@ -2401,7 +2401,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 336 end_line: 337 @@ -2420,7 +2420,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 345 end_line: 347 @@ -2440,7 +2440,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 355 end_line: 356 @@ -2459,7 +2459,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 362 end_line: 363 @@ -2478,7 +2478,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 382 end_line: 383 @@ -2497,7 +2497,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 395 end_line: 396 @@ -2516,7 +2516,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 402 end_line: 403 @@ -2535,7 +2535,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 411 end_line: 411 @@ -2552,7 +2552,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 419 end_line: 420 @@ -2571,7 +2571,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 431 end_line: 432 @@ -2590,7 +2590,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 439 end_line: 440 @@ -2609,7 +2609,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 447 end_line: 448 @@ -2628,7 +2628,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 454 end_line: 455 @@ -2647,7 +2647,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 465 end_line: 466 @@ -2666,7 +2666,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 475 end_line: 476 @@ -2685,7 +2685,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 484 end_line: 485 @@ -2704,7 +2704,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 494 end_line: 495 @@ -2723,7 +2723,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 502 end_line: 503 @@ -2742,7 +2742,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 509 end_line: 510 @@ -2761,7 +2761,7 @@ other_license_detections: license_expression_spdx: Artistic-2.0 matches: - license_expression: artistic-2.0 - spdx_license_expression: Artistic-2.0 + license_expression_spdx: Artistic-2.0 from_file: start_line: 516 end_line: 517 @@ -2780,7 +2780,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 524 end_line: 525 @@ -2799,7 +2799,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 531 end_line: 532 @@ -2818,7 +2818,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-2.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later from_file: start_line: 539 end_line: 545 @@ -2842,7 +2842,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 553 end_line: 554 @@ -2861,7 +2861,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 561 end_line: 570 @@ -2888,7 +2888,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 578 end_line: 579 @@ -2907,7 +2907,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 585 end_line: 586 @@ -2926,7 +2926,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 600 end_line: 601 @@ -2945,7 +2945,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 609 end_line: 610 @@ -2964,7 +2964,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 618 end_line: 619 @@ -2983,7 +2983,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 628 end_line: 629 @@ -3002,7 +3002,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-2.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-2.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-2.0-or-later from_file: start_line: 636 end_line: 640 @@ -3024,7 +3024,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 647 end_line: 648 @@ -3043,7 +3043,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 655 end_line: 656 @@ -3062,7 +3062,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 663 end_line: 664 @@ -3081,7 +3081,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 673 end_line: 674 @@ -3100,7 +3100,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 681 end_line: 682 @@ -3119,7 +3119,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 690 end_line: 691 @@ -3138,7 +3138,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 698 end_line: 699 @@ -3157,7 +3157,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 706 end_line: 707 @@ -3176,7 +3176,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 717 end_line: 718 @@ -3195,7 +3195,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 724 end_line: 725 @@ -3214,7 +3214,7 @@ other_license_detections: license_expression_spdx: MIT OR GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: mit OR gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: MIT OR GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: MIT OR GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 732 end_line: 734 @@ -3234,7 +3234,7 @@ other_license_detections: license_expression_spdx: MIT OR Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: mit OR artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: MIT OR Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: MIT OR Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 748 end_line: 749 @@ -3253,7 +3253,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 755 end_line: 756 @@ -3272,7 +3272,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 763 end_line: 767 @@ -3294,7 +3294,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 775 end_line: 776 @@ -3313,7 +3313,7 @@ other_license_detections: license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND metamail matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 784 end_line: 785 @@ -3328,7 +3328,7 @@ other_license_detections: This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: metamail - spdx_license_expression: metamail + license_expression_spdx: metamail from_file: start_line: 792 end_line: 801 @@ -3355,7 +3355,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 809 end_line: 810 @@ -3374,7 +3374,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 817 end_line: 818 @@ -3393,7 +3393,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 825 end_line: 825 @@ -3410,7 +3410,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 832 end_line: 833 @@ -3429,7 +3429,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 840 end_line: 841 @@ -3448,7 +3448,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 848 end_line: 850 @@ -3468,7 +3468,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 857 end_line: 858 @@ -3487,7 +3487,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 866 end_line: 867 @@ -3506,7 +3506,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 875 end_line: 876 @@ -3525,7 +3525,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 919 end_line: 920 @@ -3544,7 +3544,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 927 end_line: 928 @@ -3563,7 +3563,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 935 end_line: 936 @@ -3583,7 +3583,7 @@ other_license_detections: AND LicenseRef-scancode-public-domain-disclaimer) matches: - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 950 end_line: 954 @@ -3601,7 +3601,7 @@ other_license_detections: of Perl or of its documentation (printed or otherwise), this works is covered under Perl's Artistic License. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 957 end_line: 961 @@ -3619,7 +3619,7 @@ other_license_detections: see fit. A simple comment in the code giving credit to the FAQ would be courteous but is not required. - license_expression: artistic-2.0 AND public-domain-disclaimer - spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 965 end_line: 967 @@ -3639,7 +3639,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 975 end_line: 977 @@ -3659,7 +3659,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 984 end_line: 985 @@ -3678,7 +3678,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 992 end_line: 993 @@ -3697,7 +3697,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1008 end_line: 1009 @@ -3716,7 +3716,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1029 end_line: 1030 @@ -3735,7 +3735,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1037 end_line: 1038 @@ -3754,7 +3754,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1045 end_line: 1046 @@ -3773,7 +3773,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1054 end_line: 1055 @@ -3792,7 +3792,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1063 end_line: 1064 @@ -3811,7 +3811,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1072 end_line: 1073 @@ -3830,7 +3830,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1080 end_line: 1081 @@ -3849,7 +3849,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1096 end_line: 1097 @@ -3868,7 +3868,7 @@ other_license_detections: license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1104 end_line: 1105 @@ -3883,7 +3883,7 @@ other_license_detections: This documentation is free; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 1107 end_line: 1111 @@ -3905,7 +3905,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1119 end_line: 1120 @@ -3924,7 +3924,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1126 end_line: 1127 @@ -3943,7 +3943,7 @@ other_license_detections: license_expression_spdx: CC0-1.0 matches: - license_expression: cc0-1.0 - spdx_license_expression: CC0-1.0 + license_expression_spdx: CC0-1.0 from_file: start_line: 1138 end_line: 1140 @@ -3963,7 +3963,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1148 end_line: 1149 @@ -3982,7 +3982,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1156 end_line: 1159 @@ -4003,7 +4003,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1180 end_line: 1184 @@ -4025,7 +4025,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 1191 end_line: 1192 @@ -4044,7 +4044,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1198 end_line: 1199 @@ -4063,7 +4063,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause AND (GPL-1.0-or-later OR Artistic-1.0-Perl) matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 1208 end_line: 1208 @@ -4076,7 +4076,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1065.RULE matched_text: is licensed under the BSD-like license - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1209 end_line: 1210 @@ -4095,7 +4095,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1218 end_line: 1219 @@ -4114,7 +4114,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-unicode matches: - license_expression: unicode - spdx_license_expression: LicenseRef-scancode-unicode + license_expression_spdx: LicenseRef-scancode-unicode from_file: start_line: 1226 end_line: 1226 @@ -4131,7 +4131,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1236 end_line: 1237 @@ -4150,7 +4150,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1248 end_line: 1252 @@ -4172,7 +4172,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1262 end_line: 1263 @@ -4191,7 +4191,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1271 end_line: 1272 @@ -4210,7 +4210,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1279 end_line: 1280 @@ -4229,7 +4229,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1288 end_line: 1289 @@ -4249,7 +4249,7 @@ other_license_detections: Artistic-1.0-Perl) matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1297 end_line: 1298 @@ -4264,7 +4264,7 @@ other_license_detections: This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1300 end_line: 1301 @@ -4283,7 +4283,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1308 end_line: 1309 @@ -4302,7 +4302,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 matches: - license_expression: gpl-1.0-plus OR artistic-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0 + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0 from_file: start_line: 1315 end_line: 1316 @@ -4321,7 +4321,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1324 end_line: 1325 @@ -4340,7 +4340,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1332 end_line: 1333 @@ -4359,7 +4359,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1340 end_line: 1341 @@ -4378,7 +4378,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1349 end_line: 1350 @@ -4393,7 +4393,7 @@ other_license_detections: This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1353 end_line: 1355 @@ -4413,7 +4413,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1361 end_line: 1361 @@ -4430,7 +4430,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1368 end_line: 1369 @@ -4449,7 +4449,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1375 end_line: 1375 @@ -4466,7 +4466,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1382 end_line: 1383 @@ -4485,7 +4485,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1390 end_line: 1390 @@ -4502,7 +4502,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1397 end_line: 1398 @@ -4521,7 +4521,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1409 end_line: 1410 @@ -4540,7 +4540,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1417 end_line: 1418 @@ -4559,7 +4559,7 @@ other_license_detections: license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND BSD-3-Clause matches: - license_expression: (artistic-perl-1.0 OR gpl-1.0-plus) AND bsd-new - spdx_license_expression: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND BSD-3-Clause + license_expression_spdx: (Artistic-1.0-Perl OR GPL-1.0-or-later) AND BSD-3-Clause from_file: start_line: 1427 end_line: 1433 @@ -4583,7 +4583,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1456 end_line: 1457 @@ -4602,7 +4602,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1467 end_line: 1468 @@ -4621,7 +4621,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1476 end_line: 1477 @@ -4640,7 +4640,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1487 end_line: 1488 @@ -4659,7 +4659,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1497 end_line: 1498 @@ -4678,7 +4678,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1517 end_line: 1518 @@ -4697,7 +4697,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1527 end_line: 1529 @@ -4717,7 +4717,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1539 end_line: 1540 @@ -4736,7 +4736,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1547 end_line: 1548 @@ -4755,7 +4755,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1556 end_line: 1557 @@ -4774,7 +4774,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1566 end_line: 1567 @@ -4793,7 +4793,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1574 end_line: 1575 @@ -4812,7 +4812,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1582 end_line: 1583 @@ -4831,7 +4831,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1590 end_line: 1591 @@ -4850,7 +4850,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1598 end_line: 1600 @@ -4870,7 +4870,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1609 end_line: 1609 @@ -4888,7 +4888,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1616 end_line: 1617 @@ -4907,7 +4907,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1624 end_line: 1626 @@ -4927,7 +4927,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1633 end_line: 1634 @@ -4946,7 +4946,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0 matches: - license_expression: artistic-1.0 - spdx_license_expression: Artistic-1.0 + license_expression_spdx: Artistic-1.0 from_file: start_line: 1641 end_line: 1641 @@ -4963,7 +4963,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1661 end_line: 1662 @@ -4982,7 +4982,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1670 end_line: 1671 @@ -4997,7 +4997,7 @@ other_license_detections: As above, it is assumed that this file is licensed under the same terms as Perl itself. - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1679 end_line: 1680 @@ -5016,7 +5016,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1687 end_line: 1689 @@ -5036,7 +5036,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1696 end_line: 1697 @@ -5055,7 +5055,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1705 end_line: 1706 @@ -5074,7 +5074,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl matches: - license_expression: artistic-perl-1.0 - spdx_license_expression: Artistic-1.0-Perl + license_expression_spdx: Artistic-1.0-Perl from_file: start_line: 1712 end_line: 1712 @@ -5091,7 +5091,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1723 end_line: 1724 @@ -5110,7 +5110,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1734 end_line: 1735 @@ -5129,7 +5129,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1742 end_line: 1743 @@ -5148,7 +5148,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1761 end_line: 1761 @@ -5165,7 +5165,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1768 end_line: 1769 @@ -5184,7 +5184,7 @@ other_license_detections: license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1778 end_line: 1779 @@ -5199,7 +5199,7 @@ other_license_detections: This documentation is free; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 1781 end_line: 1785 @@ -5221,7 +5221,7 @@ other_license_detections: license_expression_spdx: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer matches: - license_expression: artistic-2.0 AND public-domain-disclaimer - spdx_license_expression: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer + license_expression_spdx: Artistic-2.0 AND LicenseRef-scancode-public-domain-disclaimer from_file: start_line: 1794 end_line: 1796 @@ -5241,7 +5241,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1805 end_line: 1805 @@ -5258,7 +5258,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1814 end_line: 1814 @@ -5275,7 +5275,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1821 end_line: 1821 @@ -5292,7 +5292,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1836 end_line: 1837 @@ -5311,7 +5311,7 @@ other_license_detections: license_expression_spdx: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-scancode-public-domain matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1844 end_line: 1845 @@ -5326,7 +5326,7 @@ other_license_detections: This documentation is free; you can redistribute it and/or modify it under the same terms as Perl itself. - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 1847 end_line: 1851 @@ -5348,7 +5348,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1861 end_line: 1861 @@ -5365,7 +5365,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1868 end_line: 1868 @@ -5382,7 +5382,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 1875 end_line: 1875 @@ -5399,7 +5399,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 1891 end_line: 1892 @@ -5418,7 +5418,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR artistic-dist-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR LicenseRef-scancode-artistic-1988-1.0 + license_expression_spdx: Artistic-1.0-Perl OR LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later from_file: start_line: '1913' @@ -5452,7 +5452,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 matches: - license_expression: artistic-dist-1.0 - spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0 + license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 from_file: start_line: '1942' end_line: '1944' @@ -5472,7 +5472,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later matches: - license_expression: artistic-dist-1.0 OR gpl-1.0-plus - spdx_license_expression: LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later + license_expression_spdx: LicenseRef-scancode-artistic-1988-1.0 OR GPL-1.0-or-later from_file: start_line: '1969' end_line: '1993' @@ -5514,7 +5514,7 @@ other_license_detections: license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl matches: - license_expression: gpl-1.0-plus OR artistic-perl-1.0 - spdx_license_expression: GPL-1.0-or-later OR Artistic-1.0-Perl + license_expression_spdx: GPL-1.0-or-later OR Artistic-1.0-Perl from_file: start_line: 2000 end_line: 2007 @@ -5539,7 +5539,7 @@ other_license_detections: license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later matches: - license_expression: artistic-perl-1.0 OR gpl-1.0-plus - spdx_license_expression: Artistic-1.0-Perl OR GPL-1.0-or-later + license_expression_spdx: Artistic-1.0-Perl OR GPL-1.0-or-later from_file: start_line: 2020 end_line: 2023 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/sed/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/sed/copyright-detailed.expected.yml index 2c1fbab45e..9c14a73baf 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/sed/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/sed/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later AND GFDL-1.3-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 11 end_line: 17 @@ -28,7 +28,7 @@ license_detections: On Debian GNU/Linux systems you can find a copy of the GPL in /usr/share/common-licenses/GPL-3 - license_expression: gfdl-1.3-plus - spdx_license_expression: GFDL-1.3-or-later + license_expression_spdx: GFDL-1.3-or-later from_file: start_line: '19' end_line: 21 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/sysvinit-utils/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/sysvinit-utils/copyright-detailed.expected.yml index 3fd1294033..6508fd01b6 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/sysvinit-utils/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/sysvinit-utils/copyright-detailed.expected.yml @@ -13,7 +13,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 33 end_line: 33 @@ -26,7 +26,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 34 end_line: 48 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/tar/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/tar/copyright-detailed.expected.yml index 58163a6541..fe1bd87421 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/tar/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/tar/copyright-detailed.expected.yml @@ -8,7 +8,7 @@ license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 20 end_line: 26 @@ -29,7 +29,7 @@ license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 32 end_line: 38 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/util-linux/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/util-linux/copyright-detailed.expected.yml index bc7191dbd7..a6d4f5d7fd 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/util-linux/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/util-linux/copyright-detailed.expected.yml @@ -75,7 +75,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 345 end_line: 346 @@ -94,7 +94,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-only matches: - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 350 end_line: 350 @@ -107,7 +107,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_561.RULE matched_text: 'License: gpl-2' - license_expression: gpl-2.0 - spdx_license_expression: GPL-2.0-only + license_expression_spdx: GPL-2.0-only from_file: start_line: 351 end_line: 365 @@ -139,7 +139,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 367 end_line: 367 @@ -152,7 +152,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 368 end_line: 383 @@ -185,7 +185,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 385 end_line: 385 @@ -198,7 +198,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 386 end_line: 400 @@ -230,7 +230,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause matches: - license_expression: bsd-simplified - spdx_license_expression: BSD-2-Clause + license_expression_spdx: BSD-2-Clause from_file: start_line: 403 end_line: 410 @@ -255,7 +255,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 413 end_line: 437 @@ -297,7 +297,7 @@ other_license_detections: license_expression_spdx: BSD-4-Clause-UC matches: - license_expression: bsd-original-uc - spdx_license_expression: BSD-4-Clause-UC + license_expression_spdx: BSD-4-Clause-UC from_file: start_line: 440 end_line: 466 @@ -341,7 +341,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later AND LGPL-2.1-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 468 end_line: 468 @@ -354,7 +354,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_51.RULE matched_text: 'License: lgpl' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 469 end_line: 473 @@ -376,7 +376,7 @@ other_license_detections: license_expression_spdx: LGPL-2.0-or-later matches: - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 475 end_line: 475 @@ -389,7 +389,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_61.RULE matched_text: 'License: lgpl-2+' - license_expression: lgpl-2.0-plus - spdx_license_expression: LGPL-2.0-or-later + license_expression_spdx: LGPL-2.0-or-later from_file: start_line: 476 end_line: 490 @@ -421,7 +421,7 @@ other_license_detections: license_expression_spdx: LGPL-2.1-or-later matches: - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 492 end_line: 492 @@ -434,7 +434,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_108.RULE matched_text: 'License: lgpl-2.1+' - license_expression: lgpl-2.1-plus - spdx_license_expression: LGPL-2.1-or-later + license_expression_spdx: LGPL-2.1-or-later from_file: start_line: 493 end_line: 508 @@ -467,7 +467,7 @@ other_license_detections: license_expression_spdx: LGPL-3.0-or-later matches: - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 510 end_line: 510 @@ -480,7 +480,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-3.0-plus_166.RULE matched_text: 'License: lgpl-3+' - license_expression: lgpl-3.0-plus - spdx_license_expression: LGPL-3.0-or-later + license_expression_spdx: LGPL-3.0-or-later from_file: start_line: 511 end_line: 525 @@ -512,7 +512,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 528 end_line: 546 diff --git a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/zlib1g/copyright-detailed.expected.yml b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/zlib1g/copyright-detailed.expected.yml index 8d99a2edbd..284a341f89 100644 --- a/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/zlib1g/copyright-detailed.expected.yml +++ b/tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/zlib1g/copyright-detailed.expected.yml @@ -14,7 +14,7 @@ other_license_detections: license_expression_spdx: Zlib matches: - license_expression: zlib - spdx_license_expression: Zlib + license_expression_spdx: Zlib from_file: start_line: 57 end_line: 74 diff --git a/tests/packagedcode/data/debian/copyright/metadata_archive/diffutils_3.7-5_copyright.expected.json b/tests/packagedcode/data/debian/copyright/metadata_archive/diffutils_3.7-5_copyright.expected.json index b8deaeee7f..a6ed905b04 100644 --- a/tests/packagedcode/data/debian/copyright/metadata_archive/diffutils_3.7-5_copyright.expected.json +++ b/tests/packagedcode/data/debian/copyright/metadata_archive/diffutils_3.7-5_copyright.expected.json @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": null, "start_line": 18, "end_line": 29, @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "gfdl-1.3-plus", - "spdx_license_expression": "GFDL-1.3-or-later", + "license_expression_spdx": "GFDL-1.3-or-later", "from_file": null, "start_line": 38, "end_line": 44, diff --git a/tests/packagedcode/data/debian/copyright/simplified-license/stable_copyright.expected.yml b/tests/packagedcode/data/debian/copyright/simplified-license/stable_copyright.expected.yml index aaf010a203..3b056a2133 100644 --- a/tests/packagedcode/data/debian/copyright/simplified-license/stable_copyright.expected.yml +++ b/tests/packagedcode/data/debian/copyright/simplified-license/stable_copyright.expected.yml @@ -36,7 +36,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 71 end_line: 71 @@ -49,7 +49,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE matched_text: 'License: apache-2.0' - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 72 end_line: 88 @@ -83,7 +83,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-zeusbench matches: - license_expression: zeusbench - spdx_license_expression: LicenseRef-scancode-zeusbench + license_expression_spdx: LicenseRef-scancode-zeusbench from_file: start_line: 94 end_line: 103 @@ -110,7 +110,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 118 end_line: 142 @@ -152,7 +152,7 @@ other_license_detections: license_expression_spdx: HPND-sell-variant AND metamail matches: - license_expression: x11-keith-packard - spdx_license_expression: HPND-sell-variant + license_expression_spdx: HPND-sell-variant from_file: start_line: 172 end_line: '191' @@ -185,7 +185,7 @@ other_license_detections: OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - license_expression: metamail - spdx_license_expression: metamail + license_expression_spdx: metamail from_file: start_line: '197' end_line: 206 @@ -212,7 +212,7 @@ other_license_detections: license_expression_spdx: GPL-3.0-or-later matches: - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 209 end_line: 209 @@ -225,7 +225,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-3.0-plus_92.RULE matched_text: 'License: gpl-3+' - license_expression: gpl-3.0-plus - spdx_license_expression: GPL-3.0-or-later + license_expression_spdx: GPL-3.0-or-later from_file: start_line: 210 end_line: 222 @@ -255,7 +255,7 @@ other_license_detections: license_expression_spdx: GPL-2.0-or-later matches: - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 224 end_line: 224 @@ -268,7 +268,7 @@ other_license_detections: rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_22.RULE matched_text: 'License: gpl-2+' - license_expression: gpl-2.0-plus - spdx_license_expression: GPL-2.0-or-later + license_expression_spdx: GPL-2.0-or-later from_file: start_line: 225 end_line: 237 @@ -298,7 +298,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-public-domain matches: - license_expression: public-domain - spdx_license_expression: LicenseRef-scancode-public-domain + license_expression_spdx: LicenseRef-scancode-public-domain from_file: start_line: 240 end_line: 272 @@ -348,7 +348,7 @@ other_license_detections: license_expression_spdx: BSD-2-Clause-Darwin matches: - license_expression: bsd-simplified-darwin - spdx_license_expression: BSD-2-Clause-Darwin + license_expression_spdx: BSD-2-Clause-Darwin from_file: start_line: 279 end_line: 302 @@ -389,7 +389,7 @@ other_license_detections: license_expression_spdx: Apache-2.0 AND Spencer-94 matches: - license_expression: apache-2.0 - spdx_license_expression: Apache-2.0 + license_expression_spdx: Apache-2.0 from_file: start_line: 306 end_line: 309 @@ -406,7 +406,7 @@ other_license_detections: acknowledge Cisco Systems as the original contributor of this module. All other licensing and usage conditions are those of the Apache Software Foundation. - license_expression: hs-regexp - spdx_license_expression: Spencer-94 + license_expression_spdx: Spencer-94 from_file: start_line: 317 end_line: 335 @@ -442,7 +442,7 @@ other_license_detections: license_expression_spdx: LicenseRef-scancode-bsd-unchanged matches: - license_expression: bsd-unchanged - spdx_license_expression: LicenseRef-scancode-bsd-unchanged + license_expression_spdx: LicenseRef-scancode-bsd-unchanged from_file: start_line: 370 end_line: 391 @@ -481,7 +481,7 @@ other_license_detections: license_expression_spdx: BSD-3-Clause matches: - license_expression: bsd-new - spdx_license_expression: BSD-3-Clause + license_expression_spdx: BSD-3-Clause from_file: start_line: 395 end_line: 419 @@ -523,7 +523,7 @@ other_license_detections: license_expression_spdx: Bison-exception-2.2 matches: - license_expression: bison-exception-2.2 - spdx_license_expression: Bison-exception-2.2 + license_expression_spdx: Bison-exception-2.2 from_file: start_line: 422 end_line: 433 @@ -552,7 +552,7 @@ other_license_detections: license_expression_spdx: MIT matches: - license_expression: mit - spdx_license_expression: MIT + license_expression_spdx: MIT from_file: start_line: 439 end_line: 454 diff --git a/tests/packagedcode/data/debian/debian-container-layer.tar.xz.get-installed-expected.json b/tests/packagedcode/data/debian/debian-container-layer.tar.xz.get-installed-expected.json index 1056637121..04e9b37950 100644 --- a/tests/packagedcode/data/debian/debian-container-layer.tar.xz.get-installed-expected.json +++ b/tests/packagedcode/data/debian/debian-container-layer.tar.xz.get-installed-expected.json @@ -44,7 +44,7 @@ "matches": [ { "license_expression": "x11-fsf", - "spdx_license_expression": "X11-distribute-modifications-variant", + "license_expression_spdx": "X11-distribute-modifications-variant", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 23, "end_line": 45, @@ -66,7 +66,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 50, "end_line": 70, @@ -88,7 +88,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 76, "end_line": 98, @@ -110,7 +110,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 105, "end_line": 127, @@ -230,7 +230,7 @@ "matches": [ { "license_expression": "x11-fsf", - "spdx_license_expression": "X11-distribute-modifications-variant", + "license_expression_spdx": "X11-distribute-modifications-variant", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 23, "end_line": 45, @@ -252,7 +252,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 50, "end_line": 70, @@ -274,7 +274,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 76, "end_line": 98, @@ -296,7 +296,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 105, "end_line": 127, @@ -480,7 +480,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 13, "end_line": 13, @@ -495,7 +495,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 14, "end_line": 26, @@ -510,7 +510,7 @@ }, { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 24, "end_line": 30, @@ -612,7 +612,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 13, "end_line": 13, @@ -627,7 +627,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 14, "end_line": 26, @@ -642,7 +642,7 @@ }, { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 24, "end_line": 30, diff --git a/tests/packagedcode/data/debian/debian-container-layer.tar.xz.scan-expected.json b/tests/packagedcode/data/debian/debian-container-layer.tar.xz.scan-expected.json index ab4f842eef..f68bb6b7b5 100644 --- a/tests/packagedcode/data/debian/debian-container-layer.tar.xz.scan-expected.json +++ b/tests/packagedcode/data/debian/debian-container-layer.tar.xz.scan-expected.json @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "x11-fsf", - "spdx_license_expression": "X11-distribute-modifications-variant", + "license_expression_spdx": "X11-distribute-modifications-variant", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 23, "end_line": 45, @@ -67,7 +67,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 50, "end_line": 70, @@ -89,7 +89,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 76, "end_line": 98, @@ -111,7 +111,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 105, "end_line": 127, @@ -243,7 +243,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 13, "end_line": 13, @@ -258,7 +258,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 14, "end_line": 26, @@ -273,7 +273,7 @@ }, { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 24, "end_line": 30, @@ -425,7 +425,7 @@ "matches": [ { "license_expression": "x11-fsf", - "spdx_license_expression": "X11-distribute-modifications-variant", + "license_expression_spdx": "X11-distribute-modifications-variant", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 23, "end_line": 45, @@ -447,7 +447,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 50, "end_line": 70, @@ -469,7 +469,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 76, "end_line": 98, @@ -491,7 +491,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libncurses5/copyright", "start_line": 105, "end_line": 127, @@ -578,7 +578,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 13, "end_line": 13, @@ -593,7 +593,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 14, "end_line": 26, @@ -608,7 +608,7 @@ }, { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "debian-container-layer.tar.xz/usr/share/doc/libndp0/copyright", "start_line": 24, "end_line": 30, diff --git a/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected index 1cb3987904..a5d8dfaf3c 100644 --- a/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected +++ b/tests/packagedcode/data/freebsd/basic/+COMPACT_MANIFEST.expected @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected index b346c458c0..42fa20d1d1 100644 --- a/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected +++ b/tests/packagedcode/data/freebsd/basic2/+COMPACT_MANIFEST.expected @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected index 179dae3114..b0e0265b64 100644 --- a/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected +++ b/tests/packagedcode/data/freebsd/dual_license/+COMPACT_MANIFEST.expected @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "ruby", - "spdx_license_expression": "Ruby", + "license_expression_spdx": "Ruby", "from_file": null, "start_line": 1, "end_line": 1, @@ -68,7 +68,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected index 53b841b06e..f1a48357d7 100644 --- a/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected +++ b/tests/packagedcode/data/freebsd/dual_license2/+COMPACT_MANIFEST.expected @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -68,7 +68,7 @@ "matches": [ { "license_expression": "ruby", - "spdx_license_expression": "Ruby", + "license_expression_spdx": "Ruby", "from_file": null, "start_line": 1, "end_line": 1, @@ -90,7 +90,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected b/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected index 25bf0cdf32..5dd18a95aa 100644 --- a/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected +++ b/tests/packagedcode/data/freebsd/multi_license/+COMPACT_MANIFEST.expected @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "python", - "spdx_license_expression": "Python-2.0", + "license_expression_spdx": "Python-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -68,7 +68,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/haxe/basic/haxelib.json.expected b/tests/packagedcode/data/haxe/basic/haxelib.json.expected index 7af404334f..30e942c5f3 100644 --- a/tests/packagedcode/data/haxe/basic/haxelib.json.expected +++ b/tests/packagedcode/data/haxe/basic/haxelib.json.expected @@ -78,7 +78,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/haxe/basic2/haxelib.json.expected b/tests/packagedcode/data/haxe/basic2/haxelib.json.expected index f3564d0520..78349719d5 100644 --- a/tests/packagedcode/data/haxe/basic2/haxelib.json.expected +++ b/tests/packagedcode/data/haxe/basic2/haxelib.json.expected @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/haxe/deps/haxelib.json.expected b/tests/packagedcode/data/haxe/deps/haxelib.json.expected index 8bc7f51a43..c85b406cf8 100644 --- a/tests/packagedcode/data/haxe/deps/haxelib.json.expected +++ b/tests/packagedcode/data/haxe/deps/haxelib.json.expected @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/haxe/tags/haxelib.json.expected b/tests/packagedcode/data/haxe/tags/haxelib.json.expected index 7828f74370..7265fc6e36 100644 --- a/tests/packagedcode/data/haxe/tags/haxelib.json.expected +++ b/tests/packagedcode/data/haxe/tags/haxelib.json.expected @@ -50,7 +50,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/instance/python-package-instance-expected-with-test-manifests-with-license.json b/tests/packagedcode/data/instance/python-package-instance-expected-with-test-manifests-with-license.json index 841abc06c8..3b61cf0b61 100644 --- a/tests/packagedcode/data/instance/python-package-instance-expected-with-test-manifests-with-license.json +++ b/tests/packagedcode/data/instance/python-package-instance-expected-with-test-manifests-with-license.json @@ -51,7 +51,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi-with-test-manifests/PKG-INFO", "start_line": 1, "end_line": 1, @@ -192,7 +192,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi-with-test-manifests/LICENSE", "start_line": 3, "end_line": 19, @@ -281,7 +281,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi-with-test-manifests/PKG-INFO", "start_line": 1, "end_line": 1, @@ -330,7 +330,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi-with-test-manifests/PKG-INFO", "start_line": 14, "end_line": 14, @@ -351,7 +351,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "pypi-with-test-manifests/PKG-INFO", "start_line": 26, "end_line": 26, @@ -365,7 +365,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi-with-test-manifests/LICENSE", "start_line": 3, "end_line": 19, @@ -523,7 +523,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi-with-test-manifests/setup.cfg", "start_line": 12, "end_line": 12, @@ -856,7 +856,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi-with-test-manifests/setup.cfg", "start_line": 12, "end_line": 12, @@ -913,7 +913,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi-with-test-manifests/LICENSE", "start_line": 3, "end_line": 19, diff --git a/tests/packagedcode/data/instance/python-package-instance-expected-with-test-manifests.json b/tests/packagedcode/data/instance/python-package-instance-expected-with-test-manifests.json index 4cf385c1bc..31fd5ef763 100644 --- a/tests/packagedcode/data/instance/python-package-instance-expected-with-test-manifests.json +++ b/tests/packagedcode/data/instance/python-package-instance-expected-with-test-manifests.json @@ -51,7 +51,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi-with-test-manifests/PKG-INFO", "start_line": 1, "end_line": 1, @@ -167,7 +167,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi-with-test-manifests/PKG-INFO", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/instance/python-package-instance-expected-with-uuid.json b/tests/packagedcode/data/instance/python-package-instance-expected-with-uuid.json index 76425552f4..12685f32c1 100644 --- a/tests/packagedcode/data/instance/python-package-instance-expected-with-uuid.json +++ b/tests/packagedcode/data/instance/python-package-instance-expected-with-uuid.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/setup.cfg", "start_line": 1, "end_line": 1, @@ -178,7 +178,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/setup.cfg", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/instance/python-package-instance-expected.json b/tests/packagedcode/data/instance/python-package-instance-expected.json index 76425552f4..12685f32c1 100644 --- a/tests/packagedcode/data/instance/python-package-instance-expected.json +++ b/tests/packagedcode/data/instance/python-package-instance-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/setup.cfg", "start_line": 1, "end_line": 1, @@ -178,7 +178,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/setup.cfg", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/instance/python-package-instance-with-license-expected.json b/tests/packagedcode/data/instance/python-package-instance-with-license-expected.json index 3ca743cc87..c5aa756e18 100644 --- a/tests/packagedcode/data/instance/python-package-instance-with-license-expected.json +++ b/tests/packagedcode/data/instance/python-package-instance-with-license-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/setup.cfg", "start_line": 1, "end_line": 1, @@ -56,7 +56,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/LICENSE.rst", "start_line": 1, "end_line": 1, @@ -274,7 +274,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/LICENSE.rst", "start_line": 1, "end_line": 1, @@ -354,7 +354,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/setup.cfg", "start_line": 1, "end_line": 1, @@ -369,7 +369,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/LICENSE.rst", "start_line": 1, "end_line": 1, @@ -418,7 +418,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/setup.cfg", "start_line": 13, "end_line": 14, @@ -432,7 +432,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/LICENSE.rst", "start_line": 1, "end_line": 1, @@ -456,7 +456,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/setup.cfg", "start_line": 25, "end_line": 25, @@ -514,7 +514,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/LICENSE.rst", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/license_detection/license-as-manifest-comment/activemq-camel.expected.json b/tests/packagedcode/data/license_detection/license-as-manifest-comment/activemq-camel.expected.json index 6da63c43eb..6c3d615e3e 100644 --- a/tests/packagedcode/data/license_detection/license-as-manifest-comment/activemq-camel.expected.json +++ b/tests/packagedcode/data/license_detection/license-as-manifest-comment/activemq-camel.expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "activemq-camel/activemq-camel-pom.xml", "start_line": 3, "end_line": 16, @@ -312,7 +312,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "activemq-camel/activemq-camel-pom.xml", "start_line": 3, "end_line": 16, @@ -487,7 +487,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "activemq-camel/activemq-camel-pom.xml", "start_line": 3, "end_line": 16, diff --git a/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection-diag.expected.json b/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection-diag.expected.json index dce195c329..7ff4e9c399 100644 --- a/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection-diag.expected.json +++ b/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection-diag.expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google-built-collection/LICENSE", "start_line": 3, "end_line": 28, @@ -163,7 +163,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google-built-collection/LICENSE", "start_line": 3, "end_line": 28, @@ -223,7 +223,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google-built-collection/LICENSE", "start_line": 3, "end_line": 28, diff --git a/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection.expected.json b/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection.expected.json index 9ff3e37e8e..b66c524d51 100644 --- a/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection.expected.json +++ b/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection.expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google-built-collection/LICENSE", "start_line": 3, "end_line": 28, @@ -159,7 +159,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google-built-collection/LICENSE", "start_line": 3, "end_line": 28, @@ -217,7 +217,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google-built-collection/LICENSE", "start_line": 3, "end_line": 28, diff --git a/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection_without_license_text.expected.json b/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection_without_license_text.expected.json index 86221aeb95..b55d166de9 100644 --- a/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection_without_license_text.expected.json +++ b/tests/packagedcode/data/license_detection/license-beside-manifest/google-built-collection_without_license_text.expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google-built-collection/LICENSE", "start_line": 3, "end_line": 28, @@ -157,7 +157,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google-built-collection/LICENSE", "start_line": 3, "end_line": 28, @@ -214,7 +214,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google-built-collection/LICENSE", "start_line": 3, "end_line": 28, diff --git a/tests/packagedcode/data/license_detection/multi-flavor/jquery-form-3.51.0.expected.json b/tests/packagedcode/data/license_detection/multi-flavor/jquery-form-3.51.0.expected.json index 3848173130..e260e9005e 100644 --- a/tests/packagedcode/data/license_detection/multi-flavor/jquery-form-3.51.0.expected.json +++ b/tests/packagedcode/data/license_detection/multi-flavor/jquery-form-3.51.0.expected.json @@ -59,7 +59,7 @@ "matches": [ { "license_expression": "mit OR gpl-2.0", - "spdx_license_expression": "MIT OR GPL-2.0-only", + "license_expression_spdx": "MIT OR GPL-2.0-only", "from_file": "jquery-form-3.51.0/README.md", "start_line": 12, "end_line": 21, @@ -147,7 +147,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "jquery-form-3.51.0/composer.json", "start_line": 1, "end_line": 1, @@ -169,7 +169,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "jquery-form-3.51.0/composer.json", "start_line": 1, "end_line": 1, @@ -252,7 +252,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "jquery-form-3.51.0/package.json", "start_line": 1, "end_line": 1, @@ -274,7 +274,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "jquery-form-3.51.0/package.json", "start_line": 1, "end_line": 1, @@ -296,7 +296,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "jquery-form-3.51.0/package.json", "start_line": 1, "end_line": 1, @@ -318,7 +318,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "jquery-form-3.51.0/package.json", "start_line": 1, "end_line": 1, @@ -714,7 +714,7 @@ "matches": [ { "license_expression": "mit OR gpl-2.0", - "spdx_license_expression": "MIT OR GPL-2.0-only", + "license_expression_spdx": "MIT OR GPL-2.0-only", "from_file": "jquery-form-3.51.0/README.md", "start_line": 12, "end_line": 21, @@ -774,7 +774,7 @@ "matches": [ { "license_expression": "mit OR gpl-2.0", - "spdx_license_expression": "MIT OR GPL-2.0-only", + "license_expression_spdx": "MIT OR GPL-2.0-only", "from_file": "jquery-form-3.51.0/README.md", "start_line": 12, "end_line": 21, @@ -891,7 +891,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "jquery-form-3.51.0/composer.json", "start_line": 1, "end_line": 1, @@ -913,7 +913,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "jquery-form-3.51.0/composer.json", "start_line": 1, "end_line": 1, @@ -978,7 +978,7 @@ "matches": [ { "license_expression": "mit OR gpl-2.0-plus", - "spdx_license_expression": "MIT OR GPL-2.0-or-later", + "license_expression_spdx": "MIT OR GPL-2.0-or-later", "from_file": "jquery-form-3.51.0/composer.json", "start_line": 21, "end_line": 23, @@ -994,7 +994,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "jquery-form-3.51.0/composer.json", "start_line": 23, "end_line": 23, @@ -1066,7 +1066,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "jquery-form-3.51.0/package.json", "start_line": 1, "end_line": 1, @@ -1088,7 +1088,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "jquery-form-3.51.0/package.json", "start_line": 1, "end_line": 1, @@ -1110,7 +1110,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "jquery-form-3.51.0/package.json", "start_line": 1, "end_line": 1, @@ -1132,7 +1132,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "jquery-form-3.51.0/package.json", "start_line": 1, "end_line": 1, @@ -1251,7 +1251,7 @@ "matches": [ { "license_expression": "mit OR gpl-2.0", - "spdx_license_expression": "MIT OR GPL-2.0-only", + "license_expression_spdx": "MIT OR GPL-2.0-only", "from_file": "jquery-form-3.51.0/package.json", "start_line": 17, "end_line": 22, diff --git a/tests/packagedcode/data/license_detection/reference-at-manifest/fizzler.expected.json b/tests/packagedcode/data/license_detection/reference-at-manifest/fizzler.expected.json index 609860cad8..977f8f1fda 100644 --- a/tests/packagedcode/data/license_detection/reference-at-manifest/fizzler.expected.json +++ b/tests/packagedcode/data/license_detection/reference-at-manifest/fizzler.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "fizzler/Fizzler.nuspec", "start_line": 1, "end_line": 1, @@ -56,7 +56,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "fizzler/COPYING.txt", "start_line": 1, "end_line": 1, @@ -72,7 +72,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "fizzler/COPYING.txt", "start_line": 3, "end_line": 3, @@ -328,7 +328,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "fizzler/COPYING.txt", "start_line": 1, "end_line": 1, @@ -344,7 +344,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "fizzler/COPYING.txt", "start_line": 3, "end_line": 3, @@ -412,7 +412,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "fizzler/Fizzler.nuspec", "start_line": 1, "end_line": 1, @@ -427,7 +427,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "fizzler/COPYING.txt", "start_line": 1, "end_line": 1, @@ -443,7 +443,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "fizzler/COPYING.txt", "start_line": 3, "end_line": 3, @@ -523,7 +523,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "fizzler/Fizzler.nuspec", "start_line": 9, "end_line": 9, @@ -539,7 +539,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "fizzler/COPYING.txt", "start_line": 1, "end_line": 1, @@ -555,7 +555,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "fizzler/COPYING.txt", "start_line": 3, "end_line": 3, diff --git a/tests/packagedcode/data/license_detection/reference-at-manifest/flutter_playtabs_bridge.expected.json b/tests/packagedcode/data/license_detection/reference-at-manifest/flutter_playtabs_bridge.expected.json index ef8d32852a..cd7427fb90 100644 --- a/tests/packagedcode/data/license_detection/reference-at-manifest/flutter_playtabs_bridge.expected.json +++ b/tests/packagedcode/data/license_detection/reference-at-manifest/flutter_playtabs_bridge.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec", "start_line": 1, "end_line": 1, @@ -56,7 +56,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "flutter_playtabs_bridge/LICENSE", "start_line": 1, "end_line": 1, @@ -72,7 +72,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "flutter_playtabs_bridge/LICENSE", "start_line": 5, "end_line": 21, @@ -233,7 +233,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "flutter_playtabs_bridge/LICENSE", "start_line": 1, "end_line": 1, @@ -249,7 +249,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "flutter_playtabs_bridge/LICENSE", "start_line": 5, "end_line": 21, @@ -317,7 +317,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec", "start_line": 1, "end_line": 1, @@ -332,7 +332,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "flutter_playtabs_bridge/LICENSE", "start_line": 1, "end_line": 1, @@ -348,7 +348,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "flutter_playtabs_bridge/LICENSE", "start_line": 5, "end_line": 21, @@ -399,7 +399,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec", "start_line": 13, "end_line": 13, @@ -415,7 +415,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "flutter_playtabs_bridge/LICENSE", "start_line": 1, "end_line": 1, @@ -431,7 +431,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "flutter_playtabs_bridge/LICENSE", "start_line": 5, "end_line": 21, diff --git a/tests/packagedcode/data/license_detection/reference-at-manifest/flutter_playtabs_bridge_without_license.expected.json b/tests/packagedcode/data/license_detection/reference-at-manifest/flutter_playtabs_bridge_without_license.expected.json index 7453b10c4f..026ce1ba6c 100644 --- a/tests/packagedcode/data/license_detection/reference-at-manifest/flutter_playtabs_bridge_without_license.expected.json +++ b/tests/packagedcode/data/license_detection/reference-at-manifest/flutter_playtabs_bridge_without_license.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec", "start_line": 1, "end_line": 1, @@ -134,7 +134,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "flutter_playtabs_bridge/flutter_paytabs_bridge.podspec", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/license_detection/reference-at-manifest/nanopb.expected.json b/tests/packagedcode/data/license_detection/reference-at-manifest/nanopb.expected.json index dad175885f..439243bc48 100644 --- a/tests/packagedcode/data/license_detection/reference-at-manifest/nanopb.expected.json +++ b/tests/packagedcode/data/license_detection/reference-at-manifest/nanopb.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "nanopb/nanopb.podspec", "start_line": 1, "end_line": 1, @@ -56,7 +56,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "nanopb/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -185,7 +185,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "nanopb/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -253,7 +253,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "nanopb/nanopb.podspec", "start_line": 1, "end_line": 1, @@ -268,7 +268,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "nanopb/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -319,7 +319,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "nanopb/nanopb.podspec", "start_line": 14, "end_line": 14, @@ -335,7 +335,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "nanopb/LICENSE.txt", "start_line": 3, "end_line": 20, diff --git a/tests/packagedcode/data/license_detection/reference-at-manifest/nanopb_without_license.expected.json b/tests/packagedcode/data/license_detection/reference-at-manifest/nanopb_without_license.expected.json index 2799009777..f49e40148a 100644 --- a/tests/packagedcode/data/license_detection/reference-at-manifest/nanopb_without_license.expected.json +++ b/tests/packagedcode/data/license_detection/reference-at-manifest/nanopb_without_license.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "nanopb/nanopb.podspec", "start_line": 1, "end_line": 1, @@ -134,7 +134,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "nanopb/nanopb.podspec", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/license_detection/reference-to-package/base.expected.json b/tests/packagedcode/data/license_detection/reference-to-package/base.expected.json index 60773baba9..1d91ec6352 100644 --- a/tests/packagedcode/data/license_detection/reference-to-package/base.expected.json +++ b/tests/packagedcode/data/license_detection/reference-to-package/base.expected.json @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "base-example/PKG-INFO", "start_line": 1, "end_line": 1, @@ -222,7 +222,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "base-example/PKG-INFO", "start_line": 1, "end_line": 1, @@ -271,7 +271,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "base-example/PKG-INFO", "start_line": 16, "end_line": 16, @@ -310,7 +310,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "base-example/django.po", "start_line": 1, "end_line": 1, @@ -326,7 +326,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "base-example/PKG-INFO", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/license_detection/reference-to-package/fusiondirectory.expected.json b/tests/packagedcode/data/license_detection/reference-to-package/fusiondirectory.expected.json index 4b37c79dab..9460193dc2 100644 --- a/tests/packagedcode/data/license_detection/reference-to-package/fusiondirectory.expected.json +++ b/tests/packagedcode/data/license_detection/reference-to-package/fusiondirectory.expected.json @@ -6074,7 +6074,7 @@ "license_clues": [ { "license_expression": "borceux", - "spdx_license_expression": "Borceux", + "license_expression_spdx": "Borceux", "from_file": "fusiondirectory/debian/README.multi-orig-tarball-package", "start_line": 1, "end_line": 3, @@ -6258,7 +6258,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 297, "end_line": 297, @@ -6282,7 +6282,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 411, "end_line": 411, @@ -6306,7 +6306,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "fusiondirectory/debian/copyright", "start_line": 413, "end_line": 413, @@ -6330,7 +6330,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 427, "end_line": 427, @@ -6354,7 +6354,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 433, "end_line": 433, @@ -6378,7 +6378,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 441, "end_line": 441, @@ -6402,7 +6402,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 452, "end_line": 452, @@ -6426,7 +6426,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 461, "end_line": 461, @@ -6450,7 +6450,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 475, "end_line": 475, @@ -6474,7 +6474,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 488, "end_line": 488, @@ -6498,7 +6498,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 495, "end_line": 495, @@ -6522,7 +6522,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 503, "end_line": 503, @@ -6546,7 +6546,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 560, "end_line": 560, @@ -6570,7 +6570,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "fusiondirectory/debian/copyright", "start_line": 562, "end_line": 562, @@ -6594,7 +6594,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 968, "end_line": 968, @@ -6618,7 +6618,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "fusiondirectory/debian/copyright", "start_line": 1094, "end_line": 1094, @@ -6642,7 +6642,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1099, "end_line": 1099, @@ -6666,7 +6666,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1413, "end_line": 1413, @@ -6690,7 +6690,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1423, "end_line": 1423, @@ -6714,7 +6714,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright", "start_line": 1429, "end_line": 1429, @@ -6738,7 +6738,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1437, "end_line": 1437, @@ -6762,7 +6762,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1443, "end_line": 1443, @@ -6786,7 +6786,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1449, "end_line": 1449, @@ -6810,7 +6810,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1457, "end_line": 1457, @@ -6834,7 +6834,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1463, "end_line": 1463, @@ -6858,7 +6858,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1469, "end_line": 1469, @@ -6882,7 +6882,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1475, "end_line": 1475, @@ -6906,7 +6906,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1481, "end_line": 1481, @@ -6930,7 +6930,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1487, "end_line": 1487, @@ -6954,7 +6954,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1493, "end_line": 1493, @@ -6978,7 +6978,7 @@ "matches": [ { "license_expression": "bsd-original", - "spdx_license_expression": "BSD-4-Clause", + "license_expression_spdx": "BSD-4-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1501, "end_line": 1501, @@ -7002,7 +7002,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright", "start_line": 1507, "end_line": 1507, @@ -7026,7 +7026,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright", "start_line": 1513, "end_line": 1513, @@ -7050,7 +7050,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -7066,7 +7066,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -7082,7 +7082,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -7098,7 +7098,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -7114,7 +7114,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -7130,7 +7130,7 @@ }, { "license_expression": "bsd-original", - "spdx_license_expression": "BSD-4-Clause", + "license_expression_spdx": "BSD-4-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -7146,7 +7146,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1523, "end_line": 1523, @@ -7162,7 +7162,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1524, "end_line": 1539, @@ -7178,7 +7178,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1541, "end_line": 1541, @@ -7194,7 +7194,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1542, "end_line": 1557, @@ -7210,7 +7210,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1559, "end_line": 1559, @@ -7226,7 +7226,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1560, "end_line": 1577, @@ -7242,7 +7242,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright", "start_line": 1579, "end_line": 1579, @@ -7258,7 +7258,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright", "start_line": 1580, "end_line": 1596, @@ -7274,7 +7274,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1598, "end_line": 1598, @@ -7290,7 +7290,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1599, "end_line": 1621, @@ -7306,7 +7306,7 @@ }, { "license_expression": "bsd-original", - "spdx_license_expression": "BSD-4-Clause", + "license_expression_spdx": "BSD-4-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1623, "end_line": 1623, @@ -7322,7 +7322,7 @@ }, { "license_expression": "bsd-original", - "spdx_license_expression": "BSD-4-Clause", + "license_expression_spdx": "BSD-4-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1624, "end_line": 1649, @@ -7338,7 +7338,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1651, "end_line": 1651, @@ -7354,7 +7354,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1652, "end_line": 1663, @@ -7370,7 +7370,7 @@ }, { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "fusiondirectory/debian/copyright", "start_line": 1665, "end_line": 1665, @@ -7386,7 +7386,7 @@ }, { "license_expression": "other-permissive", - "spdx_license_expression": "LicenseRef-scancode-other-permissive", + "license_expression_spdx": "LicenseRef-scancode-other-permissive", "from_file": "fusiondirectory/debian/copyright", "start_line": 1666, "end_line": 1669, @@ -7410,7 +7410,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2692, "end_line": 2692, @@ -7434,7 +7434,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2804, "end_line": 2804, @@ -7458,7 +7458,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2818, "end_line": 2818, @@ -7482,7 +7482,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2844, "end_line": 2844, @@ -7506,7 +7506,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2863, "end_line": 2863, @@ -7530,7 +7530,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2873, "end_line": 2873, @@ -7554,7 +7554,7 @@ "matches": [ { "license_expression": "bsd-simplified", - "spdx_license_expression": "BSD-2-Clause", + "license_expression_spdx": "BSD-2-Clause", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2880, "end_line": 2880, @@ -7578,7 +7578,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2889, "end_line": 2889, @@ -7602,7 +7602,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2903, "end_line": 2903, @@ -7626,7 +7626,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2911, "end_line": 2911, @@ -7650,7 +7650,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2919, "end_line": 2919, @@ -7674,7 +7674,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2925, "end_line": 2925, @@ -7698,7 +7698,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2939, "end_line": 2939, @@ -7722,7 +7722,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2945, "end_line": 2945, @@ -7746,7 +7746,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2951, "end_line": 2951, @@ -7770,7 +7770,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2959, "end_line": 2959, @@ -7794,7 +7794,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2964, "end_line": 2964, @@ -7818,7 +7818,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2970, "end_line": 2970, @@ -7842,7 +7842,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2976, "end_line": 2976, @@ -7866,7 +7866,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2982, "end_line": 2982, @@ -7890,7 +7890,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2988, "end_line": 2988, @@ -7914,7 +7914,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2993, "end_line": 2993, @@ -7938,7 +7938,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2999, "end_line": 2999, @@ -7962,7 +7962,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3005, "end_line": 3005, @@ -7986,7 +7986,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3010, "end_line": 3010, @@ -8002,7 +8002,7 @@ }, { "license_expression": "other-permissive", - "spdx_license_expression": "LicenseRef-scancode-other-permissive", + "license_expression_spdx": "LicenseRef-scancode-other-permissive", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3010, "end_line": 3010, @@ -8026,7 +8026,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3016, "end_line": 3016, @@ -8042,7 +8042,7 @@ }, { "license_expression": "bsd-original", - "spdx_license_expression": "BSD-4-Clause", + "license_expression_spdx": "BSD-4-Clause", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3016, "end_line": 3016, @@ -8058,7 +8058,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3016, "end_line": 3016, @@ -12873,7 +12873,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 297, "end_line": 297, @@ -12897,7 +12897,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 411, "end_line": 411, @@ -12921,7 +12921,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "fusiondirectory/debian/copyright", "start_line": 413, "end_line": 413, @@ -12945,7 +12945,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 427, "end_line": 427, @@ -12969,7 +12969,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 433, "end_line": 433, @@ -12993,7 +12993,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 441, "end_line": 441, @@ -13017,7 +13017,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 452, "end_line": 452, @@ -13041,7 +13041,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 461, "end_line": 461, @@ -13065,7 +13065,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 475, "end_line": 475, @@ -13089,7 +13089,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 488, "end_line": 488, @@ -13113,7 +13113,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 495, "end_line": 495, @@ -13137,7 +13137,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 503, "end_line": 503, @@ -13161,7 +13161,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 560, "end_line": 560, @@ -13185,7 +13185,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "fusiondirectory/debian/copyright", "start_line": 562, "end_line": 562, @@ -13209,7 +13209,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 968, "end_line": 968, @@ -13233,7 +13233,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "fusiondirectory/debian/copyright", "start_line": 1094, "end_line": 1094, @@ -13257,7 +13257,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1099, "end_line": 1099, @@ -13281,7 +13281,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1413, "end_line": 1413, @@ -13305,7 +13305,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1423, "end_line": 1423, @@ -13329,7 +13329,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright", "start_line": 1429, "end_line": 1429, @@ -13353,7 +13353,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1437, "end_line": 1437, @@ -13377,7 +13377,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1443, "end_line": 1443, @@ -13401,7 +13401,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1449, "end_line": 1449, @@ -13425,7 +13425,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1457, "end_line": 1457, @@ -13449,7 +13449,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1463, "end_line": 1463, @@ -13473,7 +13473,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1469, "end_line": 1469, @@ -13497,7 +13497,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1475, "end_line": 1475, @@ -13521,7 +13521,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1481, "end_line": 1481, @@ -13545,7 +13545,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1487, "end_line": 1487, @@ -13569,7 +13569,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1493, "end_line": 1493, @@ -13593,7 +13593,7 @@ "matches": [ { "license_expression": "bsd-original", - "spdx_license_expression": "BSD-4-Clause", + "license_expression_spdx": "BSD-4-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1501, "end_line": 1501, @@ -13617,7 +13617,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright", "start_line": 1507, "end_line": 1507, @@ -13641,7 +13641,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright", "start_line": 1513, "end_line": 1513, @@ -13665,7 +13665,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -13681,7 +13681,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -13697,7 +13697,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -13713,7 +13713,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -13729,7 +13729,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -13745,7 +13745,7 @@ }, { "license_expression": "bsd-original", - "spdx_license_expression": "BSD-4-Clause", + "license_expression_spdx": "BSD-4-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1521, "end_line": 1521, @@ -13761,7 +13761,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1523, "end_line": 1523, @@ -13777,7 +13777,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1524, "end_line": 1539, @@ -13793,7 +13793,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1541, "end_line": 1541, @@ -13809,7 +13809,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1542, "end_line": 1557, @@ -13825,7 +13825,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1559, "end_line": 1559, @@ -13841,7 +13841,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1560, "end_line": 1577, @@ -13857,7 +13857,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright", "start_line": 1579, "end_line": 1579, @@ -13873,7 +13873,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright", "start_line": 1580, "end_line": 1596, @@ -13889,7 +13889,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1598, "end_line": 1598, @@ -13905,7 +13905,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1599, "end_line": 1621, @@ -13921,7 +13921,7 @@ }, { "license_expression": "bsd-original", - "spdx_license_expression": "BSD-4-Clause", + "license_expression_spdx": "BSD-4-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1623, "end_line": 1623, @@ -13937,7 +13937,7 @@ }, { "license_expression": "bsd-original", - "spdx_license_expression": "BSD-4-Clause", + "license_expression_spdx": "BSD-4-Clause", "from_file": "fusiondirectory/debian/copyright", "start_line": 1624, "end_line": 1649, @@ -13953,7 +13953,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1651, "end_line": 1651, @@ -13969,7 +13969,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "fusiondirectory/debian/copyright", "start_line": 1652, "end_line": 1663, @@ -13985,7 +13985,7 @@ }, { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "fusiondirectory/debian/copyright", "start_line": 1665, "end_line": 1665, @@ -14001,7 +14001,7 @@ }, { "license_expression": "other-permissive", - "spdx_license_expression": "LicenseRef-scancode-other-permissive", + "license_expression_spdx": "LicenseRef-scancode-other-permissive", "from_file": "fusiondirectory/debian/copyright", "start_line": 1666, "end_line": 1669, @@ -14138,7 +14138,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2692, "end_line": 2692, @@ -14162,7 +14162,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2804, "end_line": 2804, @@ -14186,7 +14186,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2818, "end_line": 2818, @@ -14210,7 +14210,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2844, "end_line": 2844, @@ -14234,7 +14234,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2863, "end_line": 2863, @@ -14258,7 +14258,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2873, "end_line": 2873, @@ -14282,7 +14282,7 @@ "matches": [ { "license_expression": "bsd-simplified", - "spdx_license_expression": "BSD-2-Clause", + "license_expression_spdx": "BSD-2-Clause", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2880, "end_line": 2880, @@ -14306,7 +14306,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2889, "end_line": 2889, @@ -14330,7 +14330,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2903, "end_line": 2903, @@ -14354,7 +14354,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2911, "end_line": 2911, @@ -14378,7 +14378,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2919, "end_line": 2919, @@ -14402,7 +14402,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2925, "end_line": 2925, @@ -14426,7 +14426,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2939, "end_line": 2939, @@ -14450,7 +14450,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2945, "end_line": 2945, @@ -14474,7 +14474,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2951, "end_line": 2951, @@ -14498,7 +14498,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2959, "end_line": 2959, @@ -14522,7 +14522,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2964, "end_line": 2964, @@ -14546,7 +14546,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2970, "end_line": 2970, @@ -14570,7 +14570,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2976, "end_line": 2976, @@ -14594,7 +14594,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2982, "end_line": 2982, @@ -14618,7 +14618,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2988, "end_line": 2988, @@ -14642,7 +14642,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2993, "end_line": 2993, @@ -14666,7 +14666,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 2999, "end_line": 2999, @@ -14690,7 +14690,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3005, "end_line": 3005, @@ -14714,7 +14714,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3010, "end_line": 3010, @@ -14730,7 +14730,7 @@ }, { "license_expression": "other-permissive", - "spdx_license_expression": "LicenseRef-scancode-other-permissive", + "license_expression_spdx": "LicenseRef-scancode-other-permissive", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3010, "end_line": 3010, @@ -14754,7 +14754,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3016, "end_line": 3016, @@ -14770,7 +14770,7 @@ }, { "license_expression": "bsd-original", - "spdx_license_expression": "BSD-4-Clause", + "license_expression_spdx": "BSD-4-Clause", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3016, "end_line": 3016, @@ -14786,7 +14786,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "fusiondirectory/debian/copyright.in", "start_line": 3016, "end_line": 3016, @@ -15035,7 +15035,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "fusiondirectory/debian/po/de.po", "start_line": 3, "end_line": 3, @@ -15172,7 +15172,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "fusiondirectory/debian/po/fr.po", "start_line": 3, "end_line": 3, diff --git a/tests/packagedcode/data/license_detection/reference-to-package/google_appengine_sdk.expected.json b/tests/packagedcode/data/license_detection/reference-to-package/google_appengine_sdk.expected.json index 33781880cc..afe62a8f95 100644 --- a/tests/packagedcode/data/license_detection/reference-to-package/google_appengine_sdk.expected.json +++ b/tests/packagedcode/data/license_detection/reference-to-package/google_appengine_sdk.expected.json @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.2/setup.py", "start_line": 1, "end_line": 1, @@ -150,7 +150,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.3/PKG-INFO", "start_line": 1, "end_line": 1, @@ -410,7 +410,7 @@ "matches": [ { "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND proprietary-license", - "spdx_license_expression": "Apache-2.0 AND CC-BY-NC-ND-3.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-proprietary-license", + "license_expression_spdx": "Apache-2.0 AND CC-BY-NC-ND-3.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-proprietary-license", "from_file": "google_appengine_sdk/django-1.2/MANIFEST.in", "start_line": 7, "end_line": 9, @@ -537,7 +537,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/LC_MESSAGES/djangojs.po", "start_line": 1, "end_line": 1, @@ -553,7 +553,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.2/setup.py", "start_line": 1, "end_line": 1, @@ -593,7 +593,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/en/formats.py", "start_line": 2, "end_line": 2, @@ -609,7 +609,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.2/setup.py", "start_line": 1, "end_line": 1, @@ -673,7 +673,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/LC_MESSAGES/django.po", "start_line": 3, "end_line": 3, @@ -689,7 +689,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.2/setup.py", "start_line": 1, "end_line": 1, @@ -729,7 +729,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/LC_MESSAGES/djangojs.po", "start_line": 3, "end_line": 3, @@ -745,7 +745,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.2/setup.py", "start_line": 1, "end_line": 1, @@ -785,7 +785,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "google_appengine_sdk/django-1.2/django/conf/locale/uk/formats.py", "start_line": 2, "end_line": 2, @@ -801,7 +801,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.2/setup.py", "start_line": 1, "end_line": 1, @@ -941,7 +941,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.2/setup.py", "start_line": 1, "end_line": 1, @@ -990,7 +990,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.2/setup.py", "start_line": 89, "end_line": 89, @@ -1069,7 +1069,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.3/LICENSE", "start_line": 4, "end_line": 27, @@ -1108,7 +1108,7 @@ "matches": [ { "license_expression": "apache-2.0 AND cc-by-nc-nd-3.0 AND other-permissive AND proprietary-license", - "spdx_license_expression": "Apache-2.0 AND CC-BY-NC-ND-3.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-proprietary-license", + "license_expression_spdx": "Apache-2.0 AND CC-BY-NC-ND-3.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-proprietary-license", "from_file": "google_appengine_sdk/django-1.3/MANIFEST.in", "start_line": 7, "end_line": 9, @@ -1206,7 +1206,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.3/PKG-INFO", "start_line": 1, "end_line": 1, @@ -1255,7 +1255,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.3/PKG-INFO", "start_line": 16, "end_line": 16, @@ -1380,7 +1380,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/en/LC_MESSAGES/django.po", "start_line": 1, "end_line": 1, @@ -1396,7 +1396,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.3/PKG-INFO", "start_line": 1, "end_line": 1, @@ -1460,7 +1460,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "google_appengine_sdk/django-1.3/django/contrib/messages/locale/uk/LC_MESSAGES/django.po", "start_line": 1, "end_line": 1, @@ -1476,7 +1476,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.3/PKG-INFO", "start_line": 1, "end_line": 1, @@ -1537,7 +1537,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.3/LICENSE", "start_line": 4, "end_line": 27, @@ -1645,7 +1645,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.3/setup.py", "start_line": 1, "end_line": 1, @@ -1694,7 +1694,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "google_appengine_sdk/django-1.3/setup.py", "start_line": 89, "end_line": 89, diff --git a/tests/packagedcode/data/license_detection/reference-to-package/paddlenlp.expected.json b/tests/packagedcode/data/license_detection/reference-to-package/paddlenlp.expected.json index d9f6de9b6f..390c43db44 100644 --- a/tests/packagedcode/data/license_detection/reference-to-package/paddlenlp.expected.json +++ b/tests/packagedcode/data/license_detection/reference-to-package/paddlenlp.expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 1, "end_line": 1, @@ -69,7 +69,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 1, "end_line": 1, @@ -961,7 +961,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/LICENSE", "start_line": 3, "end_line": 5, @@ -1000,7 +1000,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/README.md", "start_line": 305, "end_line": 307, @@ -1039,7 +1039,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/README_en.md", "start_line": 6, "end_line": 8, @@ -1055,7 +1055,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/README_en.md", "start_line": 8, "end_line": 8, @@ -1071,7 +1071,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/LICENSE", "start_line": 3, "end_line": 5, @@ -1160,7 +1160,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/changelog.po", "start_line": 3, "end_line": 3, @@ -1176,7 +1176,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 1, "end_line": 1, @@ -1191,7 +1191,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 1, "end_line": 1, @@ -1231,7 +1231,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "paddlenlp/docs/locale/en/LC_MESSAGES/data.po", "start_line": 3, "end_line": 3, @@ -1247,7 +1247,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 1, "end_line": 1, @@ -1262,7 +1262,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 1, "end_line": 1, @@ -1516,7 +1516,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/hubconf.py", "start_line": 3, "end_line": 13, @@ -1576,7 +1576,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/LICENSE", "start_line": 3, "end_line": 5, @@ -1600,7 +1600,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/README.md", "start_line": 305, "end_line": 307, @@ -1624,7 +1624,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/README_en.md", "start_line": 6, "end_line": 8, @@ -1640,7 +1640,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/README_en.md", "start_line": 8, "end_line": 8, @@ -1656,7 +1656,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/LICENSE", "start_line": 3, "end_line": 5, @@ -1977,7 +1977,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 1, "end_line": 1, @@ -1999,7 +1999,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 1, "end_line": 1, @@ -2071,7 +2071,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 3, "end_line": 13, @@ -2095,7 +2095,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 75, "end_line": 75, @@ -2111,7 +2111,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "paddlenlp/setup.py", "start_line": 78, "end_line": 78, diff --git a/tests/packagedcode/data/license_detection/reference-to-package/physics.expected.json b/tests/packagedcode/data/license_detection/reference-to-package/physics.expected.json index ae774d16d0..1bf1deda01 100644 --- a/tests/packagedcode/data/license_detection/reference-to-package/physics.expected.json +++ b/tests/packagedcode/data/license_detection/reference-to-package/physics.expected.json @@ -168,7 +168,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -229,7 +229,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/myelements/callbacks.py", "start_line": 13, "end_line": 13, @@ -245,7 +245,7 @@ }, { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "physics/myelements/callbacks.py", "start_line": 13, "end_line": 13, @@ -261,7 +261,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "physics/myelements/callbacks.py", "start_line": 14, "end_line": 25, @@ -298,7 +298,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "physics/physics.py", "start_line": 10, "end_line": 21, @@ -347,7 +347,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/en_US.po", "start_line": 3, "end_line": 3, @@ -363,7 +363,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -389,7 +389,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/en_US.po", "start_line": 7, "end_line": 7, @@ -405,7 +405,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -431,7 +431,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/en_US.po", "start_line": 11, "end_line": 11, @@ -447,7 +447,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -473,7 +473,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/en_US.po", "start_line": 15, "end_line": 15, @@ -489,7 +489,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -515,7 +515,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/en_US.po", "start_line": 19, "end_line": 19, @@ -531,7 +531,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -557,7 +557,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/en_US.po", "start_line": 23, "end_line": 23, @@ -573,7 +573,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -599,7 +599,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/en_US.po", "start_line": 27, "end_line": 27, @@ -615,7 +615,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -654,7 +654,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/uk.po", "start_line": 3, "end_line": 3, @@ -670,7 +670,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -696,7 +696,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/uk.po", "start_line": 7, "end_line": 7, @@ -712,7 +712,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -738,7 +738,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/uk.po", "start_line": 11, "end_line": 11, @@ -754,7 +754,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -780,7 +780,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/uk.po", "start_line": 15, "end_line": 15, @@ -796,7 +796,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -822,7 +822,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/uk.po", "start_line": 19, "end_line": 19, @@ -838,7 +838,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -864,7 +864,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "physics/po/uk.po", "start_line": 23, "end_line": 23, @@ -880,7 +880,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, @@ -942,7 +942,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "physics/COPYING", "start_line": 2, "end_line": 675, diff --git a/tests/packagedcode/data/license_detection/reference-to-package/samba.expected.json b/tests/packagedcode/data/license_detection/reference-to-package/samba.expected.json index 6c2e2cb60f..0db0a27036 100644 --- a/tests/packagedcode/data/license_detection/reference-to-package/samba.expected.json +++ b/tests/packagedcode/data/license_detection/reference-to-package/samba.expected.json @@ -647,7 +647,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/COPYING", "start_line": 1, "end_line": 674, @@ -720,7 +720,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 38, "end_line": 38, @@ -736,7 +736,7 @@ }, { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 38, "end_line": 38, @@ -752,7 +752,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "samba/README.contributing", "start_line": 39, "end_line": 39, @@ -776,7 +776,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 63, "end_line": 63, @@ -800,7 +800,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 76, "end_line": 76, @@ -816,7 +816,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 79, "end_line": 79, @@ -832,7 +832,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "samba/README.contributing", "start_line": 79, "end_line": 81, @@ -848,7 +848,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 84, "end_line": 84, @@ -864,7 +864,7 @@ }, { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 85, "end_line": 85, @@ -888,7 +888,7 @@ "matches": [ { "license_expression": "cc-by-sa-3.0", - "spdx_license_expression": "CC-BY-SA-3.0", + "license_expression_spdx": "CC-BY-SA-3.0", "from_file": "samba/README.contributing", "start_line": 121, "end_line": 122, @@ -904,7 +904,7 @@ }, { "license_expression": "cc-by-sa-4.0", - "spdx_license_expression": "CC-BY-SA-4.0", + "license_expression_spdx": "CC-BY-SA-4.0", "from_file": "samba/README.contributing", "start_line": 122, "end_line": 122, @@ -920,7 +920,7 @@ }, { "license_expression": "dco-1.1", - "spdx_license_expression": "LicenseRef-scancode-dco-1.1", + "license_expression_spdx": "LicenseRef-scancode-dco-1.1", "from_file": "samba/README.contributing", "start_line": 123, "end_line": 123, @@ -942,7 +942,7 @@ "license_clues": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "samba/README.contributing", "start_line": 57, "end_line": 57, @@ -958,7 +958,7 @@ }, { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "samba/README.contributing", "start_line": 60, "end_line": 61, @@ -990,7 +990,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "samba/README.md", "start_line": 6, "end_line": 6, @@ -1014,7 +1014,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.md", "start_line": 22, "end_line": 24, @@ -1030,7 +1030,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/COPYING", "start_line": 1, "end_line": 674, @@ -1092,7 +1092,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/COPYING", "start_line": 1, "end_line": 674, @@ -1116,7 +1116,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 38, "end_line": 38, @@ -1132,7 +1132,7 @@ }, { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 38, "end_line": 38, @@ -1148,7 +1148,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "samba/README.contributing", "start_line": 39, "end_line": 39, @@ -1172,7 +1172,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 63, "end_line": 63, @@ -1196,7 +1196,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 76, "end_line": 76, @@ -1212,7 +1212,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 79, "end_line": 79, @@ -1228,7 +1228,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "samba/README.contributing", "start_line": 79, "end_line": 81, @@ -1244,7 +1244,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 84, "end_line": 84, @@ -1260,7 +1260,7 @@ }, { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 85, "end_line": 85, @@ -1284,7 +1284,7 @@ "matches": [ { "license_expression": "cc-by-sa-3.0", - "spdx_license_expression": "CC-BY-SA-3.0", + "license_expression_spdx": "CC-BY-SA-3.0", "from_file": "samba/README.contributing", "start_line": 121, "end_line": 122, @@ -1300,7 +1300,7 @@ }, { "license_expression": "cc-by-sa-4.0", - "spdx_license_expression": "CC-BY-SA-4.0", + "license_expression_spdx": "CC-BY-SA-4.0", "from_file": "samba/README.contributing", "start_line": 122, "end_line": 122, @@ -1316,7 +1316,7 @@ }, { "license_expression": "dco-1.1", - "spdx_license_expression": "LicenseRef-scancode-dco-1.1", + "license_expression_spdx": "LicenseRef-scancode-dco-1.1", "from_file": "samba/README.contributing", "start_line": 123, "end_line": 123, @@ -1340,7 +1340,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "samba/README.md", "start_line": 6, "end_line": 6, @@ -1364,7 +1364,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.md", "start_line": 22, "end_line": 24, @@ -1380,7 +1380,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/COPYING", "start_line": 1, "end_line": 674, @@ -1476,7 +1476,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/COPYING", "start_line": 1, "end_line": 674, @@ -1500,7 +1500,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 38, "end_line": 38, @@ -1516,7 +1516,7 @@ }, { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 38, "end_line": 38, @@ -1532,7 +1532,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "samba/README.contributing", "start_line": 39, "end_line": 39, @@ -1556,7 +1556,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 63, "end_line": 63, @@ -1580,7 +1580,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 76, "end_line": 76, @@ -1596,7 +1596,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 79, "end_line": 79, @@ -1612,7 +1612,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "samba/README.contributing", "start_line": 79, "end_line": 81, @@ -1628,7 +1628,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 84, "end_line": 84, @@ -1644,7 +1644,7 @@ }, { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 85, "end_line": 85, @@ -1668,7 +1668,7 @@ "matches": [ { "license_expression": "cc-by-sa-3.0", - "spdx_license_expression": "CC-BY-SA-3.0", + "license_expression_spdx": "CC-BY-SA-3.0", "from_file": "samba/README.contributing", "start_line": 121, "end_line": 122, @@ -1684,7 +1684,7 @@ }, { "license_expression": "cc-by-sa-4.0", - "spdx_license_expression": "CC-BY-SA-4.0", + "license_expression_spdx": "CC-BY-SA-4.0", "from_file": "samba/README.contributing", "start_line": 122, "end_line": 122, @@ -1700,7 +1700,7 @@ }, { "license_expression": "dco-1.1", - "spdx_license_expression": "LicenseRef-scancode-dco-1.1", + "license_expression_spdx": "LicenseRef-scancode-dco-1.1", "from_file": "samba/README.contributing", "start_line": 123, "end_line": 123, @@ -1724,7 +1724,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "samba/README.md", "start_line": 6, "end_line": 6, @@ -1748,7 +1748,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.md", "start_line": 22, "end_line": 24, @@ -1764,7 +1764,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/COPYING", "start_line": 1, "end_line": 674, @@ -1861,7 +1861,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "samba/source3/locale/net/de.po", "start_line": 4, "end_line": 4, @@ -1877,7 +1877,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/COPYING", "start_line": 1, "end_line": 674, @@ -1893,7 +1893,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 38, "end_line": 38, @@ -1909,7 +1909,7 @@ }, { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 38, "end_line": 38, @@ -1925,7 +1925,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "samba/README.contributing", "start_line": 39, "end_line": 39, @@ -1941,7 +1941,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 63, "end_line": 63, @@ -1957,7 +1957,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 76, "end_line": 76, @@ -1973,7 +1973,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.contributing", "start_line": 79, "end_line": 79, @@ -1989,7 +1989,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "samba/README.contributing", "start_line": 79, "end_line": 81, @@ -2005,7 +2005,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 84, "end_line": 84, @@ -2021,7 +2021,7 @@ }, { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": "samba/README.contributing", "start_line": 85, "end_line": 85, @@ -2037,7 +2037,7 @@ }, { "license_expression": "cc-by-sa-3.0", - "spdx_license_expression": "CC-BY-SA-3.0", + "license_expression_spdx": "CC-BY-SA-3.0", "from_file": "samba/README.contributing", "start_line": 121, "end_line": 122, @@ -2053,7 +2053,7 @@ }, { "license_expression": "cc-by-sa-4.0", - "spdx_license_expression": "CC-BY-SA-4.0", + "license_expression_spdx": "CC-BY-SA-4.0", "from_file": "samba/README.contributing", "start_line": 122, "end_line": 122, @@ -2069,7 +2069,7 @@ }, { "license_expression": "dco-1.1", - "spdx_license_expression": "LicenseRef-scancode-dco-1.1", + "license_expression_spdx": "LicenseRef-scancode-dco-1.1", "from_file": "samba/README.contributing", "start_line": 123, "end_line": 123, @@ -2085,7 +2085,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "samba/README.md", "start_line": 6, "end_line": 6, @@ -2101,7 +2101,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "samba/README.md", "start_line": 22, "end_line": 24, @@ -2117,7 +2117,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": "samba/COPYING", "start_line": 1, "end_line": 674, @@ -2156,7 +2156,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "samba/source3/locale/net/genmsg", "start_line": 5, "end_line": 16, diff --git a/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.package.json b/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.package.json index 71d84489a2..3ba58460f8 100644 --- a/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.package.json +++ b/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.package.json b/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.package.json index 59f3f88a45..f3cd1ccefb 100644 --- a/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.package.json b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.package.json index 4d1056d0bc..9ea3ee2f36 100644 --- a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.package.json +++ b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.package.json b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.package.json index f1d7fc3fe9..c2cf5eee54 100644 --- a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.package.json +++ b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json b/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json index 7588ac3f62..592c278409 100644 --- a/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json +++ b/tests/packagedcode/data/m2/bytebuddy/pom.xml.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 3, diff --git a/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.package.json b/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.package.json index 47b9c5b930..8763bf8367 100644 --- a/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.package.json +++ b/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json b/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json index b554d10e13..5bf8e3e4aa 100644 --- a/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json +++ b/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json @@ -158,7 +158,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json b/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json index e765097122..205e5fc1b8 100644 --- a/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json +++ b/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json @@ -697,7 +697,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.package.json b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.package.json index ed350383e0..f1a0036c79 100644 --- a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.package.json +++ b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 2, "end_line": 2, @@ -54,7 +54,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 3, "end_line": 3, diff --git a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.package.json b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.package.json index 3f6a87f9ab..ea75cb392d 100644 --- a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.package.json +++ b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.package.json b/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.package.json index 36b704b46f..9470c17941 100644 --- a/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.package.json +++ b/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/depman/foo.pom.package.json b/tests/packagedcode/data/m2/depman/foo.pom.package.json index ccbb61ceea..55dd99ee2b 100644 --- a/tests/packagedcode/data/m2/depman/foo.pom.package.json +++ b/tests/packagedcode/data/m2/depman/foo.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json b/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json index 0510a13b2f..89c0a2fc1a 100644 --- a/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json +++ b/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json @@ -193,7 +193,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json b/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json index 14d6272d4a..52988a7734 100644 --- a/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json +++ b/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.package.json b/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.package.json index 50b84f2339..fd7ff00eb9 100644 --- a/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.package.json +++ b/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.package.json b/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.package.json index b30e88c7d5..bfe2ceebf5 100644 --- a/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.package.json +++ b/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json b/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json index 194ef82a59..08c22b9c30 100644 --- a/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json +++ b/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json @@ -228,7 +228,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.package.json b/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.package.json index 2ad03711c6..579f769521 100644 --- a/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.package.json +++ b/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.package.json b/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.package.json index 36bf196741..a28580afcd 100644 --- a/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.package.json +++ b/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.package.json b/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.package.json index 8b2bd97e7f..dfad192200 100644 --- a/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.package.json +++ b/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "mpl-1.1", - "spdx_license_expression": "MPL-1.1", + "license_expression_spdx": "MPL-1.1", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "mpl-1.1 OR lgpl-2.1-plus", - "spdx_license_expression": "MPL-1.1 OR LGPL-2.1-or-later", + "license_expression_spdx": "MPL-1.1 OR LGPL-2.1-or-later", "from_file": null, "start_line": 2, "end_line": 2, @@ -69,7 +69,7 @@ }, { "license_expression": "mpl-1.1 OR lgpl-2.1-plus", - "spdx_license_expression": "MPL-1.1 OR LGPL-2.1-or-later", + "license_expression_spdx": "MPL-1.1 OR LGPL-2.1-or-later", "from_file": null, "start_line": 3, "end_line": 3, diff --git a/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.package.json b/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.package.json index 456037ca7e..c69090dede 100644 --- a/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.package.json +++ b/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.package.json b/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.package.json index 018740deda..93724fb5ef 100644 --- a/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.package.json +++ b/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "tidy", - "spdx_license_expression": "HTMLTIDY", + "license_expression_spdx": "HTMLTIDY", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.package.json b/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.package.json index 94b9d444db..8b1bea8c29 100644 --- a/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.package.json +++ b/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "cpl-1.0", - "spdx_license_expression": "CPL-1.0", + "license_expression_spdx": "CPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "cpl-1.0", - "spdx_license_expression": "CPL-1.0", + "license_expression_spdx": "CPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.package.json b/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.package.json index 676e3af2ab..efe4fbb002 100644 --- a/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.package.json +++ b/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "cpl-1.0", - "spdx_license_expression": "CPL-1.0", + "license_expression_spdx": "CPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "cpl-1.0", - "spdx_license_expression": "CPL-1.0", + "license_expression_spdx": "CPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.package.json b/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.package.json index a8fb14edf3..2bd9033097 100644 --- a/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.package.json +++ b/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "cpl-1.0", - "spdx_license_expression": "CPL-1.0", + "license_expression_spdx": "CPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "cpl-1.0", - "spdx_license_expression": "CPL-1.0", + "license_expression_spdx": "CPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json b/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json index a2a02bfd50..a466ba1e75 100644 --- a/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json +++ b/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json @@ -536,7 +536,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json b/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json index 4fbaf7e6d6..f9220aa8f7 100644 --- a/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json +++ b/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json @@ -613,7 +613,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.package.json b/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.package.json index fc42cfcded..536777e405 100644 --- a/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.package.json +++ b/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json b/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json index 32e7bad299..724aa64d5b 100644 --- a/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json +++ b/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json @@ -102,7 +102,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json b/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json index 27d089c555..28a3bdd345 100644 --- a/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json +++ b/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json @@ -123,7 +123,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.package.json b/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.package.json index 2b8e1b1f84..4ac19572ec 100644 --- a/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.package.json +++ b/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "gpl-2.0 WITH mysql-linking-exception-2018", - "spdx_license_expression": "GPL-2.0-only WITH LicenseRef-scancode-mysql-linking-exception-2018", + "license_expression_spdx": "GPL-2.0-only WITH LicenseRef-scancode-mysql-linking-exception-2018", "from_file": null, "start_line": 1, "end_line": 5, @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 5, diff --git a/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json b/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json index 12f5a7db3a..e9e0565a2c 100644 --- a/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json +++ b/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json @@ -81,7 +81,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 4, diff --git a/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.package.json b/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.package.json index 574a880d4e..65e792ce91 100644 --- a/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.package.json +++ b/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.package.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -61,7 +61,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.package.json b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.package.json index a101cc7411..19896f5ddc 100644 --- a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.package.json +++ b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.package.json @@ -235,7 +235,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.package.json b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.package.json index 95d292c4e2..cd758e5789 100644 --- a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.package.json +++ b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.package.json @@ -235,7 +235,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.package.json b/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.package.json index 41be0355af..ff5aed660e 100644 --- a/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.package.json +++ b/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.package.json @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -68,7 +68,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 2, "end_line": 2, @@ -83,7 +83,7 @@ }, { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": null, "start_line": 3, "end_line": 3, diff --git a/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.package.json b/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.package.json index 290504c644..2fa287fe30 100644 --- a/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.package.json index 5ea10fa6af..45954eed91 100644 --- a/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.package.json b/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.package.json index 59730a2fdb..d6b68b666c 100644 --- a/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/commons/commons-jaxrs/1.22/commons-jaxrs-1.22.pom.package.json b/tests/packagedcode/data/m2/org/apache/commons/commons-jaxrs/1.22/commons-jaxrs-1.22.pom.package.json index c3e1e7e283..d44540f7e4 100644 --- a/tests/packagedcode/data/m2/org/apache/commons/commons-jaxrs/1.22/commons-jaxrs-1.22.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/commons/commons-jaxrs/1.22/commons-jaxrs-1.22.pom.package.json @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -89,7 +89,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.package.json index 70f4cdba19..4365ab6613 100644 --- a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.package.json index 7a4090f5b7..b97766b254 100644 --- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.package.json @@ -95,7 +95,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.package.json index 642c0f03a2..d6c6f6cb1b 100644 --- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.package.json @@ -95,7 +95,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.package.json index 9269a9e98a..b913870185 100644 --- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.package.json @@ -95,7 +95,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.package.json index 3d888b48e3..a2c68b9fbb 100644 --- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.package.json @@ -95,7 +95,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.package.json index 3c58116e19..a440a8c19b 100644 --- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.package.json @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -68,7 +68,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.package.json index ed254b2a7d..3a8a4a8a53 100644 --- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.package.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.package.json index e791ace803..8903e1ba86 100644 --- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.package.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.package.json index aeef2d32e4..8496c36670 100644 --- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.package.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.package.json index b0094a9d41..86883bd526 100644 --- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.package.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.package.json index 2d89b7c6fe..238375b619 100644 --- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.package.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.package.json index 8eed06f87b..b21c7a474c 100644 --- a/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.package.json index eb6cf5bd3a..1c9c5319a7 100644 --- a/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.package.json @@ -298,7 +298,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.package.json index 55894dd950..66e4008152 100644 --- a/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.package.json +++ b/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.package.json @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json index b7f75b9456..802024975c 100644 --- a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json +++ b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.package.json index fd269a41c0..9a724418d8 100644 --- a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.package.json +++ b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json index 56143a2878..838965f89e 100644 --- a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json +++ b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.package.json index d3755b04b6..a571f55cdf 100644 --- a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.package.json +++ b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json index 71771e89e2..4ce2eef682 100644 --- a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json +++ b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.package.json index d8885cdd17..6b3568b2d2 100644 --- a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.package.json +++ b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.package.json index 5921d60e93..5bc9ccc6e0 100644 --- a/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.package.json +++ b/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.package.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.package.json index b9b4673560..224134b2e0 100644 --- a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.package.json +++ b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.package.json index b9b4673560..224134b2e0 100644 --- a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.package.json +++ b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.package.json index fc9cedadf7..8fe034b281 100644 --- a/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.package.json +++ b/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.package.json @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json index faaeff724f..3ea524fdc2 100644 --- a/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json +++ b/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.package.json index cb288ee320..33f6c5261f 100644 --- a/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.package.json +++ b/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.package.json index 5276e6edba..a4fbc2781a 100644 --- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.package.json +++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.package.json @@ -165,7 +165,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.package.json b/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.package.json index 36460822dd..c9f416badd 100644 --- a/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.package.json b/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.package.json index ed2587222b..2d718d1594 100644 --- a/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.package.json index 4a57806cab..1664944978 100644 --- a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.package.json +++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.package.json index 3c97bb3ab2..db348f2b48 100644 --- a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.package.json +++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.package.json index 0747567c3f..c5937b1e6b 100644 --- a/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.package.json +++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.package.json index 94f3265726..0d43329cc8 100644 --- a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.package.json +++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.package.json index 36811d0e44..3502311a3c 100644 --- a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.package.json +++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.package.json index 73c8ccaf65..7c8b474fdd 100644 --- a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.package.json +++ b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.package.json index d460759221..74280a8254 100644 --- a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.package.json +++ b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.package.json index 709f6134e2..c3a89d8246 100644 --- a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.package.json +++ b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.package.json @@ -116,7 +116,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -131,7 +131,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.package.json index 6392b6eca1..67578678f6 100644 --- a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.package.json +++ b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.package.json @@ -95,7 +95,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -110,7 +110,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.package.json index eabe16825b..333660728f 100644 --- a/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.package.json +++ b/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "cddl-1.0", - "spdx_license_expression": "CDDL-1.0", + "license_expression_spdx": "CDDL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.package.json index a0c69d80a0..e61fb3acaa 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.package.json index 7a6a594ac5..093fe5dc52 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.package.json index 3f1cee887c..374e6eaddc 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.package.json index 15b4a3c40b..b75908ccc0 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.package.json index 1eec6cc673..431cf4c737 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.package.json index 75deda439a..11dd344367 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.package.json index 60ad9f384b..4ba483dbe4 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.package.json index 8e4220428b..27013bde37 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.package.json index 49f2c68ecb..c7a973a796 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.package.json index 3ca9ac8276..2cc4056567 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.package.json index df97554ae7..449c1ce222 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.package.json index 461f73e57f..4e604670fe 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.package.json index 3fcd9f2c04..e94dc61e2f 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.package.json index 099b22d097..f13d04df58 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.package.json index a56e7a9e25..2ff5e7832a 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.package.json index 8e1845fc5a..5b4c97a97b 100644 --- a/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.package.json +++ b/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.package.json b/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.package.json index 22872d59dc..e76f47cfd0 100644 --- a/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.package.json +++ b/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.package.json b/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.package.json index 8e5f0de31a..3f1aa3b346 100644 --- a/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.package.json +++ b/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.package.json b/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.package.json index 85426c0839..7241acd126 100644 --- a/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.package.json +++ b/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.package.json @@ -67,7 +67,7 @@ "matches": [ { "license_expression": "apache-1.1", - "spdx_license_expression": "Apache-1.1", + "license_expression_spdx": "Apache-1.1", "from_file": null, "start_line": 1, "end_line": 1, @@ -82,7 +82,7 @@ }, { "license_expression": "apache-1.1", - "spdx_license_expression": "Apache-1.1", + "license_expression_spdx": "Apache-1.1", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.package.json index 970ea462dd..52dc353c61 100644 --- a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.package.json +++ b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.package.json index a646fcff93..fd53bfa9d3 100644 --- a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.package.json +++ b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.package.json index 0e56f15f01..59e98eb899 100644 --- a/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.package.json +++ b/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.package.json index 8fab219dd7..0ed0f67602 100644 --- a/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.package.json +++ b/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json b/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json index df0b1df642..554d6d021d 100644 --- a/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json +++ b/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json @@ -256,7 +256,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json b/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json index b5502c78c6..3c3eaad729 100644 --- a/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json +++ b/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json @@ -263,7 +263,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.package.json b/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.package.json index c3bd62f482..0d50db51f0 100644 --- a/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.package.json +++ b/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.package.json b/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.package.json index 7f92eeb7ef..ed384f8e64 100644 --- a/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.package.json +++ b/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.package.json b/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.package.json index 7be61d8fce..12384c13e2 100644 --- a/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.package.json +++ b/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "sax-pd", - "spdx_license_expression": "SAX-PD", + "license_expression_spdx": "SAX-PD", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/maven2/aopalliance-1.0/aopalliance-1.0.pom.package.json b/tests/packagedcode/data/maven2/aopalliance-1.0/aopalliance-1.0.pom.package.json index 551861e51b..872c223fb7 100644 --- a/tests/packagedcode/data/maven2/aopalliance-1.0/aopalliance-1.0.pom.package.json +++ b/tests/packagedcode/data/maven2/aopalliance-1.0/aopalliance-1.0.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom.package.json b/tests/packagedcode/data/maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom.package.json index df0b1df642..554d6d021d 100644 --- a/tests/packagedcode/data/maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom.package.json +++ b/tests/packagedcode/data/maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom.package.json @@ -256,7 +256,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json b/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json index faaeff724f..3ea524fdc2 100644 --- a/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json +++ b/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/maven2/foo-pom/foo-pom.xml.package.json b/tests/packagedcode/data/maven2/foo-pom/foo-pom.xml.package.json index 6d0219a797..2e560b64ca 100644 --- a/tests/packagedcode/data/maven2/foo-pom/foo-pom.xml.package.json +++ b/tests/packagedcode/data/maven2/foo-pom/foo-pom.xml.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom.package.json b/tests/packagedcode/data/maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom.package.json index 17bd02a703..439676daf4 100644 --- a/tests/packagedcode/data/maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom.package.json +++ b/tests/packagedcode/data/maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/maven2/log4j/log4j-pom.xml.package.json b/tests/packagedcode/data/maven2/log4j/log4j-pom.xml.package.json index fc42cfcded..536777e405 100644 --- a/tests/packagedcode/data/maven2/log4j/log4j-pom.xml.package.json +++ b/tests/packagedcode/data/maven2/log4j/log4j-pom.xml.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/maven2/logback-access/logback-access.pom.package.json b/tests/packagedcode/data/maven2/logback-access/logback-access.pom.package.json index 6fe006e6f1..7389e0e7cb 100644 --- a/tests/packagedcode/data/maven2/logback-access/logback-access.pom.package.json +++ b/tests/packagedcode/data/maven2/logback-access/logback-access.pom.package.json @@ -31,7 +31,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -46,7 +46,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/maven2/spring-2.5.4/spring-2.5.4.pom.package.json b/tests/packagedcode/data/maven2/spring-2.5.4/spring-2.5.4.pom.package.json index 8e1845fc5a..5b4c97a97b 100644 --- a/tests/packagedcode/data/maven2/spring-2.5.4/spring-2.5.4.pom.package.json +++ b/tests/packagedcode/data/maven2/spring-2.5.4/spring-2.5.4.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom.package.json b/tests/packagedcode/data/maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom.package.json index 49f2c68ecb..c7a973a796 100644 --- a/tests/packagedcode/data/maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom.package.json +++ b/tests/packagedcode/data/maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom.package.json b/tests/packagedcode/data/maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom.package.json index 099b22d097..f13d04df58 100644 --- a/tests/packagedcode/data/maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom.package.json +++ b/tests/packagedcode/data/maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom.package.json @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/maven_misc/assemble/jackson-dataformat-xml-2.13.5-expected.json b/tests/packagedcode/data/maven_misc/assemble/jackson-dataformat-xml-2.13.5-expected.json index ff8f9ef5c9..969783dfcf 100644 --- a/tests/packagedcode/data/maven_misc/assemble/jackson-dataformat-xml-2.13.5-expected.json +++ b/tests/packagedcode/data/maven_misc/assemble/jackson-dataformat-xml-2.13.5-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "start_line": 1, "end_line": 8, @@ -63,7 +63,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE", "start_line": 11, "end_line": 13, @@ -77,7 +77,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "start_line": 1, "end_line": 8, @@ -226,7 +226,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "start_line": 1, "end_line": 8, @@ -289,7 +289,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "start_line": 1, "end_line": 8, @@ -311,7 +311,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE", "start_line": 11, "end_line": 13, @@ -325,7 +325,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "start_line": 1, "end_line": 8, @@ -388,7 +388,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE", "start_line": 11, "end_line": 13, @@ -402,7 +402,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jackson-dataformat-xml-2.13.5/META-INF/LICENSE", "start_line": 1, "end_line": 8, @@ -424,7 +424,7 @@ "license_clues": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": "jackson-dataformat-xml-2.13.5/META-INF/NOTICE", "start_line": 3, "end_line": 3, diff --git a/tests/packagedcode/data/maven_misc/assemble/johnzon-jsonb-1.2.11-expected.json b/tests/packagedcode/data/maven_misc/assemble/johnzon-jsonb-1.2.11-expected.json index 20a967e2c3..4b6c584c57 100644 --- a/tests/packagedcode/data/maven_misc/assemble/johnzon-jsonb-1.2.11-expected.json +++ b/tests/packagedcode/data/maven_misc/assemble/johnzon-jsonb-1.2.11-expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "johnzon-jsonb-1.2.11/META-INF/maven/org.apache.johnzon/johnzon-jsonb/pom.xml", "start_line": 3, "end_line": 18, @@ -430,7 +430,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "johnzon-jsonb-1.2.11/META-INF/DEPENDENCIES", "start_line": 9, "end_line": 13, @@ -467,7 +467,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "johnzon-jsonb-1.2.11/META-INF/LICENSE", "start_line": 2, "end_line": 4, @@ -530,7 +530,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "johnzon-jsonb-1.2.11/META-INF/MANIFEST.MF", "start_line": 1, "end_line": 1, @@ -579,7 +579,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "johnzon-jsonb-1.2.11/META-INF/MANIFEST.MF", "start_line": 6, "end_line": 6, @@ -616,7 +616,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "johnzon-jsonb-1.2.11/META-INF/NOTICE", "start_line": 5, "end_line": 6, @@ -775,7 +775,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "johnzon-jsonb-1.2.11/META-INF/maven/org.apache.johnzon/johnzon-jsonb/pom.xml", "start_line": 3, "end_line": 18, @@ -948,7 +948,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "johnzon-jsonb-1.2.11/META-INF/maven/org.apache.johnzon/johnzon-jsonb/pom.xml", "start_line": 3, "end_line": 18, diff --git a/tests/packagedcode/data/maven_misc/assemble/numbers-1.7.4-expected.json b/tests/packagedcode/data/maven_misc/assemble/numbers-1.7.4-expected.json index 16357fd6a3..4c02451a05 100644 --- a/tests/packagedcode/data/maven_misc/assemble/numbers-1.7.4-expected.json +++ b/tests/packagedcode/data/maven_misc/assemble/numbers-1.7.4-expected.json @@ -48,7 +48,7 @@ "matches": [ { "license_expression": "cc0-1.0", - "spdx_license_expression": "CC0-1.0", + "license_expression_spdx": "CC0-1.0", "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml", "start_line": 1, "end_line": 2, @@ -395,7 +395,7 @@ "matches": [ { "license_expression": "cc0-1.0", - "spdx_license_expression": "CC0-1.0", + "license_expression_spdx": "CC0-1.0", "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml", "start_line": 1, "end_line": 2, @@ -456,7 +456,7 @@ "matches": [ { "license_expression": "cc0-1.0", - "spdx_license_expression": "CC0-1.0", + "license_expression_spdx": "CC0-1.0", "from_file": "numbers-1.7.4/META-INF/maven/com.github.peteroupc/numbers/pom.xml", "start_line": 86, "end_line": 91, diff --git a/tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating-expected.json b/tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating-expected.json index e8489d1ad8..eeede11edf 100644 --- a/tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating-expected.json +++ b/tests/packagedcode/data/maven_misc/uberjars/htrace-core-4.0.0-incubating-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE", "start_line": 2, "end_line": 4, @@ -62,7 +62,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE", "start_line": 5, "end_line": 6, @@ -282,7 +282,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/commons-logging/commons-logging/pom.xml", "start_line": 2, "end_line": 15, @@ -354,7 +354,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/org.apache.htrace/htrace-core/pom.xml", "start_line": 2, "end_line": 11, @@ -781,7 +781,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES", "start_line": 11, "end_line": 11, @@ -795,7 +795,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES", "start_line": 13, "end_line": 13, @@ -809,7 +809,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES", "start_line": 15, "end_line": 15, @@ -823,7 +823,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/DEPENDENCIES", "start_line": 19, "end_line": 19, @@ -859,7 +859,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE", "start_line": 2, "end_line": 4, @@ -921,7 +921,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/LICENSE", "start_line": 2, "end_line": 4, @@ -942,7 +942,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE", "start_line": 5, "end_line": 6, @@ -1002,7 +1002,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/NOTICE", "start_line": 5, "end_line": 6, @@ -1399,7 +1399,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/commons-logging/commons-logging/pom.xml", "start_line": 2, "end_line": 15, @@ -1504,7 +1504,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/commons-logging/commons-logging/pom.xml", "start_line": 2, "end_line": 15, @@ -1589,7 +1589,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/org.apache.htrace/htrace-core/pom.xml", "start_line": 2, "end_line": 11, @@ -1683,7 +1683,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "htrace-core-4.0.0-incubating/META-INF/maven/org.apache.htrace/htrace-core/pom.xml", "start_line": 2, "end_line": 11, diff --git a/tests/packagedcode/data/models/full-expected.json b/tests/packagedcode/data/models/full-expected.json index 8919b4c321..f254042951 100644 --- a/tests/packagedcode/data/models/full-expected.json +++ b/tests/packagedcode/data/models/full-expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/models/simple-expected.json b/tests/packagedcode/data/models/simple-expected.json index 5b7197c6e4..6443262205 100644 --- a/tests/packagedcode/data/models/simple-expected.json +++ b/tests/packagedcode/data/models/simple-expected.json @@ -42,7 +42,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/alias/package.json.expected b/tests/packagedcode/data/npm/alias/package.json.expected index 9692cf34d6..595d743aec 100755 --- a/tests/packagedcode/data/npm/alias/package.json.expected +++ b/tests/packagedcode/data/npm/alias/package.json.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "blueoak-1.0.0", - "spdx_license_expression": "BlueOak-1.0.0", + "license_expression_spdx": "BlueOak-1.0.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/as_installed/package.json.expected b/tests/packagedcode/data/npm/as_installed/package.json.expected index a4de0ac6cc..cc2507b69a 100644 --- a/tests/packagedcode/data/npm/as_installed/package.json.expected +++ b/tests/packagedcode/data/npm/as_installed/package.json.expected @@ -2215,7 +2215,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/authors_list_dicts/package.json.expected b/tests/packagedcode/data/npm/authors_list_dicts/package.json.expected index 3e1081a83a..42d88732cf 100644 --- a/tests/packagedcode/data/npm/authors_list_dicts/package.json.expected +++ b/tests/packagedcode/data/npm/authors_list_dicts/package.json.expected @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -82,7 +82,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/authors_list_strings/package.json.expected b/tests/packagedcode/data/npm/authors_list_strings/package.json.expected index 70920d4f23..c34d506ae3 100644 --- a/tests/packagedcode/data/npm/authors_list_strings/package.json.expected +++ b/tests/packagedcode/data/npm/authors_list_strings/package.json.expected @@ -58,7 +58,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/casepath/package.json.expected b/tests/packagedcode/data/npm/casepath/package.json.expected index 3975a5e2c8..14875d9f97 100644 --- a/tests/packagedcode/data/npm/casepath/package.json.expected +++ b/tests/packagedcode/data/npm/casepath/package.json.expected @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/chartist/package.json.expected b/tests/packagedcode/data/npm/chartist/package.json.expected index fff7eef2b4..7c41e7dc91 100644 --- a/tests/packagedcode/data/npm/chartist/package.json.expected +++ b/tests/packagedcode/data/npm/chartist/package.json.expected @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "mit OR wtfpl-2.0", - "spdx_license_expression": "MIT OR WTFPL", + "license_expression_spdx": "MIT OR WTFPL", "from_file": null, "start_line": 1, "end_line": 1, @@ -67,7 +67,7 @@ "matches": [ { "license_expression": "wtfpl-2.0", - "spdx_license_expression": "WTFPL", + "license_expression_spdx": "WTFPL", "from_file": null, "start_line": 1, "end_line": 1, @@ -89,7 +89,7 @@ "matches": [ { "license_expression": "wtfpl-2.0", - "spdx_license_expression": "WTFPL", + "license_expression_spdx": "WTFPL", "from_file": null, "start_line": 1, "end_line": 1, @@ -111,7 +111,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -133,7 +133,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/dist/package.json.expected b/tests/packagedcode/data/npm/dist/package.json.expected index b30beb9c48..640f1dcf52 100644 --- a/tests/packagedcode/data/npm/dist/package.json.expected +++ b/tests/packagedcode/data/npm/dist/package.json.expected @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/double_license/package.json.expected b/tests/packagedcode/data/npm/double_license/package.json.expected index fdf3de927d..b20b207a8f 100644 --- a/tests/packagedcode/data/npm/double_license/package.json.expected +++ b/tests/packagedcode/data/npm/double_license/package.json.expected @@ -42,7 +42,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -64,7 +64,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/electron/package.expected.json b/tests/packagedcode/data/npm/electron/package.expected.json index ce4ae0c49a..94f5e5dcc3 100644 --- a/tests/packagedcode/data/npm/electron/package.expected.json +++ b/tests/packagedcode/data/npm/electron/package.expected.json @@ -43,7 +43,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/package.json", "start_line": 1, "end_line": 1, @@ -242,7 +242,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/package.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/express-jwt-3.4.0/package.json.expected b/tests/packagedcode/data/npm/express-jwt-3.4.0/package.json.expected index e2d6b983d0..16a104769c 100644 --- a/tests/packagedcode/data/npm/express-jwt-3.4.0/package.json.expected +++ b/tests/packagedcode/data/npm/express-jwt-3.4.0/package.json.expected @@ -51,7 +51,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -73,7 +73,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/from_npmjs/package.json.expected b/tests/packagedcode/data/npm/from_npmjs/package.json.expected index 4e232120d9..87688be8b6 100644 --- a/tests/packagedcode/data/npm/from_npmjs/package.json.expected +++ b/tests/packagedcode/data/npm/from_npmjs/package.json.expected @@ -2215,7 +2215,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/from_tarball/package.json.expected b/tests/packagedcode/data/npm/from_tarball/package.json.expected index 42bd7cadef..a5a0d17d12 100644 --- a/tests/packagedcode/data/npm/from_tarball/package.json.expected +++ b/tests/packagedcode/data/npm/from_tarball/package.json.expected @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/get_package_resources.scan.expected.json b/tests/packagedcode/data/npm/get_package_resources.scan.expected.json index da4c1e43a3..cc5f4ac8f0 100644 --- a/tests/packagedcode/data/npm/get_package_resources.scan.expected.json +++ b/tests/packagedcode/data/npm/get_package_resources.scan.expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "get_package_resources/package.json", "start_line": 1, "end_line": 1, @@ -132,7 +132,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "get_package_resources/package.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/homepage-as-list/package.json.expected b/tests/packagedcode/data/npm/homepage-as-list/package.json.expected index 19835d69dc..8385ce9600 100644 --- a/tests/packagedcode/data/npm/homepage-as-list/package.json.expected +++ b/tests/packagedcode/data/npm/homepage-as-list/package.json.expected @@ -55,7 +55,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/invalid-dep/package.json.expected b/tests/packagedcode/data/npm/invalid-dep/package.json.expected index 680a574fe2..4ff70ffc1e 100644 --- a/tests/packagedcode/data/npm/invalid-dep/package.json.expected +++ b/tests/packagedcode/data/npm/invalid-dep/package.json.expected @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/keywords/package.json.expected b/tests/packagedcode/data/npm/keywords/package.json.expected index ec19af88d3..e7e72acdd6 100644 --- a/tests/packagedcode/data/npm/keywords/package.json.expected +++ b/tests/packagedcode/data/npm/keywords/package.json.expected @@ -64,7 +64,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/legacy_license_dict/package.json.expected b/tests/packagedcode/data/npm/legacy_license_dict/package.json.expected index b3bb206055..789ab18d0a 100644 --- a/tests/packagedcode/data/npm/legacy_license_dict/package.json.expected +++ b/tests/packagedcode/data/npm/legacy_license_dict/package.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -69,7 +69,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/mime-1.3.4/package.json.expected b/tests/packagedcode/data/npm/mime-1.3.4/package.json.expected index 47abe3c5c0..6daffc3570 100644 --- a/tests/packagedcode/data/npm/mime-1.3.4/package.json.expected +++ b/tests/packagedcode/data/npm/mime-1.3.4/package.json.expected @@ -50,7 +50,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/package-lock-v2-2/package-lock.json-expected b/tests/packagedcode/data/npm/package-lock-v2-2/package-lock.json-expected index 6a24156471..655466126f 100644 --- a/tests/packagedcode/data/npm/package-lock-v2-2/package-lock.json-expected +++ b/tests/packagedcode/data/npm/package-lock-v2-2/package-lock.json-expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "isc", - "spdx_license_expression": "ISC", + "license_expression_spdx": "ISC", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/package-lock-v2/package-lock.json-expected b/tests/packagedcode/data/npm/package-lock-v2/package-lock.json-expected index 60e1b7da8e..5742cb09cc 100644 --- a/tests/packagedcode/data/npm/package-lock-v2/package-lock.json-expected +++ b/tests/packagedcode/data/npm/package-lock-v2/package-lock.json-expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "isc", - "spdx_license_expression": "ISC", + "license_expression_spdx": "ISC", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/pnpm/pnpm-lock/v5/cobe-scan.expected.json b/tests/packagedcode/data/npm/pnpm/pnpm-lock/v5/cobe-scan.expected.json index 5bf4a3ea01..63505e6974 100644 --- a/tests/packagedcode/data/npm/pnpm/pnpm-lock/v5/cobe-scan.expected.json +++ b/tests/packagedcode/data/npm/pnpm/pnpm-lock/v5/cobe-scan.expected.json @@ -99,7 +99,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "cobe/website/package.json", "start_line": 1, "end_line": 1, @@ -170,7 +170,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "cobe/package.json", "start_line": 1, "end_line": 1, @@ -2300,7 +2300,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "cobe/package.json", "start_line": 1, "end_line": 1, @@ -4144,7 +4144,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "cobe/website/package.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/pnpm/pnpm-lock/v6/tabler-scan.expected.json b/tests/packagedcode/data/npm/pnpm/pnpm-lock/v6/tabler-scan.expected.json index 398a2ee2b2..97fb94fef1 100644 --- a/tests/packagedcode/data/npm/pnpm/pnpm-lock/v6/tabler-scan.expected.json +++ b/tests/packagedcode/data/npm/pnpm/pnpm-lock/v6/tabler-scan.expected.json @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "tabler/package.json", "start_line": 1, "end_line": 1, @@ -3690,7 +3690,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "tabler/package.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/scan-nested/scan.expected.json b/tests/packagedcode/data/npm/scan-nested/scan.expected.json index 7ecbd3082d..8706277147 100644 --- a/tests/packagedcode/data/npm/scan-nested/scan.expected.json +++ b/tests/packagedcode/data/npm/scan-nested/scan.expected.json @@ -65,7 +65,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -176,7 +176,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/node_modules/sequelize/package.json", "start_line": 1, "end_line": 1, @@ -1193,7 +1193,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/node_modules/sequelize/package.json", "start_line": 1, "end_line": 1, @@ -1900,7 +1900,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/scoped1/package.json.expected b/tests/packagedcode/data/npm/scoped1/package.json.expected index bb14c9d6e0..bfb0de9182 100644 --- a/tests/packagedcode/data/npm/scoped1/package.json.expected +++ b/tests/packagedcode/data/npm/scoped1/package.json.expected @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/scoped2/package.json.expected b/tests/packagedcode/data/npm/scoped2/package.json.expected index 2876cf8380..a203c5de83 100644 --- a/tests/packagedcode/data/npm/scoped2/package.json.expected +++ b/tests/packagedcode/data/npm/scoped2/package.json.expected @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/sequelize/package.json.expected b/tests/packagedcode/data/npm/sequelize/package.json.expected index abec6fc37f..6d236ad7d4 100644 --- a/tests/packagedcode/data/npm/sequelize/package.json.expected +++ b/tests/packagedcode/data/npm/sequelize/package.json.expected @@ -77,7 +77,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/uri_vcs/package.json.expected b/tests/packagedcode/data/npm/uri_vcs/package.json.expected index fca23e357f..2d5abb5706 100644 --- a/tests/packagedcode/data/npm/uri_vcs/package.json.expected +++ b/tests/packagedcode/data/npm/uri_vcs/package.json.expected @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -62,7 +62,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/urls_dict/package.json.expected b/tests/packagedcode/data/npm/urls_dict/package.json.expected index 43460b1f19..f580a0924a 100644 --- a/tests/packagedcode/data/npm/urls_dict/package.json.expected +++ b/tests/packagedcode/data/npm/urls_dict/package.json.expected @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/utils-merge-1.0.0/package.json.expected b/tests/packagedcode/data/npm/utils-merge-1.0.0/package.json.expected index 33f1a6e766..032d794d2b 100644 --- a/tests/packagedcode/data/npm/utils-merge-1.0.0/package.json.expected +++ b/tests/packagedcode/data/npm/utils-merge-1.0.0/package.json.expected @@ -42,7 +42,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -64,7 +64,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/with_name/package.json.expected b/tests/packagedcode/data/npm/with_name/package.json.expected index 378ea0b50a..5d2803cec4 100644 --- a/tests/packagedcode/data/npm/with_name/package.json.expected +++ b/tests/packagedcode/data/npm/with_name/package.json.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/workspace/change-case.expected.json b/tests/packagedcode/data/npm/workspace/change-case.expected.json index 095257a581..033d173e42 100644 --- a/tests/packagedcode/data/npm/workspace/change-case.expected.json +++ b/tests/packagedcode/data/npm/workspace/change-case.expected.json @@ -51,7 +51,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/change-case/package.json", "start_line": 1, "end_line": 1, @@ -140,7 +140,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/sponge-case/package.json", "start_line": 1, "end_line": 1, @@ -227,7 +227,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/swap-case/package.json", "start_line": 1, "end_line": 1, @@ -314,7 +314,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/title-case/package.json", "start_line": 1, "end_line": 1, @@ -515,7 +515,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/LICENSE", "start_line": 1, "end_line": 1, @@ -572,7 +572,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/LICENSE", "start_line": 1, "end_line": 1, @@ -754,7 +754,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/change-case/package.json", "start_line": 1, "end_line": 1, @@ -801,7 +801,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/change-case/package.json", "start_line": 24, "end_line": 24, @@ -890,7 +890,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/sponge-case/package.json", "start_line": 1, "end_line": 1, @@ -937,7 +937,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/sponge-case/package.json", "start_line": 24, "end_line": 24, @@ -1024,7 +1024,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/swap-case/package.json", "start_line": 1, "end_line": 1, @@ -1071,7 +1071,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/swap-case/package.json", "start_line": 22, "end_line": 22, @@ -1158,7 +1158,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/title-case/package.json", "start_line": 1, "end_line": 1, @@ -1205,7 +1205,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "change-case/packages/title-case/package.json", "start_line": 22, "end_line": 22, diff --git a/tests/packagedcode/data/npm/workspace/crystal.expected.json b/tests/packagedcode/data/npm/workspace/crystal.expected.json index 7896eb73b7..2701c4cd84 100644 --- a/tests/packagedcode/data/npm/workspace/crystal.expected.json +++ b/tests/packagedcode/data/npm/workspace/crystal.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/bench/package.json", "start_line": 1, "end_line": 1, @@ -131,7 +131,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/dataplan-json/package.json", "start_line": 1, "end_line": 1, @@ -225,7 +225,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/dataplan-pg/package.json", "start_line": 1, "end_line": 1, @@ -322,7 +322,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/grafast/package.json", "start_line": 1, "end_line": 1, @@ -412,7 +412,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/grafserv/package.json", "start_line": 1, "end_line": 1, @@ -507,7 +507,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/grafserv-persisted/package.json", "start_line": 1, "end_line": 1, @@ -595,7 +595,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/ruru/package.json", "start_line": 1, "end_line": 1, @@ -686,7 +686,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/ruru-components/package.json", "start_line": 1, "end_line": 1, @@ -831,7 +831,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/graphile-build/graphile-build/package.json", "start_line": 1, "end_line": 1, @@ -927,7 +927,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/graphile-build/graphile-build-pg/package.json", "start_line": 1, "end_line": 1, @@ -1020,7 +1020,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/graphile-build/graphile-simplify-inflection/package.json", "start_line": 1, "end_line": 1, @@ -1109,7 +1109,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/graphile-build/graphile-utils/package.json", "start_line": 1, "end_line": 1, @@ -1258,7 +1258,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/postgraphile/pgl/package.json", "start_line": 1, "end_line": 1, @@ -1354,7 +1354,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/postgraphile/postgraphile/package.json", "start_line": 1, "end_line": 1, @@ -1495,7 +1495,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/eslint-plugin-graphile-export/package.json", "start_line": 1, "end_line": 1, @@ -1582,7 +1582,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "crystal/utils/graphile/package.json", "start_line": 1, "end_line": 1, @@ -1669,7 +1669,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/graphile-config/package.json", "start_line": 1, "end_line": 1, @@ -1762,7 +1762,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/graphile-export/package.json", "start_line": 1, "end_line": 1, @@ -1851,7 +1851,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/jest-serializer-graphql-schema/package.json", "start_line": 1, "end_line": 1, @@ -1936,7 +1936,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/jest-serializer-simple/package.json", "start_line": 1, "end_line": 1, @@ -2026,7 +2026,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/lds/package.json", "start_line": 1, "end_line": 1, @@ -2109,7 +2109,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/lru/package.json", "start_line": 1, "end_line": 1, @@ -2203,7 +2203,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/pg-introspection/package.json", "start_line": 1, "end_line": 1, @@ -2298,7 +2298,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/pg-sql2/package.json", "start_line": 1, "end_line": 1, @@ -2393,7 +2393,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/tamedevil/package.json", "start_line": 1, "end_line": 1, @@ -13594,7 +13594,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/bench/package.json", "start_line": 1, "end_line": 1, @@ -13799,7 +13799,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/dataplan-json/package.json", "start_line": 1, "end_line": 1, @@ -13986,7 +13986,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/dataplan-pg/package.json", "start_line": 1, "end_line": 1, @@ -14517,7 +14517,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/grafast/package.json", "start_line": 1, "end_line": 1, @@ -14989,7 +14989,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/grafserv-persisted/package.json", "start_line": 1, "end_line": 1, @@ -15218,7 +15218,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/grafserv/package.json", "start_line": 1, "end_line": 1, @@ -15686,7 +15686,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/ruru-components/package.json", "start_line": 1, "end_line": 1, @@ -16023,7 +16023,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/grafast/ruru/package.json", "start_line": 1, "end_line": 1, @@ -16667,7 +16667,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/graphile-build/graphile-build-pg/package.json", "start_line": 1, "end_line": 1, @@ -17163,7 +17163,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/graphile-build/graphile-build/package.json", "start_line": 1, "end_line": 1, @@ -17514,7 +17514,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/graphile-build/graphile-simplify-inflection/package.json", "start_line": 1, "end_line": 1, @@ -17652,7 +17652,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/graphile-build/graphile-utils/package.json", "start_line": 1, "end_line": 1, @@ -18790,7 +18790,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/postgraphile/pgl/package.json", "start_line": 1, "end_line": 1, @@ -19232,7 +19232,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/postgraphile/postgraphile/package.json", "start_line": 1, "end_line": 1, @@ -20091,7 +20091,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/eslint-plugin-graphile-export/package.json", "start_line": 1, "end_line": 1, @@ -20302,7 +20302,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/graphile-config/package.json", "start_line": 1, "end_line": 1, @@ -20576,7 +20576,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/graphile-export/package.json", "start_line": 1, "end_line": 1, @@ -20868,7 +20868,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "crystal/utils/graphile/package.json", "start_line": 1, "end_line": 1, @@ -21105,7 +21105,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/jest-serializer-graphql-schema/package.json", "start_line": 1, "end_line": 1, @@ -21294,7 +21294,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/jest-serializer-simple/package.json", "start_line": 1, "end_line": 1, @@ -21499,7 +21499,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/lds/package.json", "start_line": 1, "end_line": 1, @@ -21697,7 +21697,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/lru/package.json", "start_line": 1, "end_line": 1, @@ -21873,7 +21873,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/pg-introspection/package.json", "start_line": 1, "end_line": 1, @@ -22061,7 +22061,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/pg-sql2/package.json", "start_line": 1, "end_line": 1, @@ -22271,7 +22271,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "crystal/utils/tamedevil/package.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/npm/yarn-lock/resolve-deps.expected.json b/tests/packagedcode/data/npm/yarn-lock/resolve-deps.expected.json index 45a430fc0b..7023029276 100644 --- a/tests/packagedcode/data/npm/yarn-lock/resolve-deps.expected.json +++ b/tests/packagedcode/data/npm/yarn-lock/resolve-deps.expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "resolve-deps/package.json", "start_line": 1, "end_line": 1, @@ -610,7 +610,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "resolve-deps/package.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected b/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected index 63c0c43abe..512a0994a3 100644 --- a/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/Castle.Core.nuspec.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected b/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected index 2c67693b34..5e4133bd82 100644 --- a/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/EntityFramework.nuspec.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "ms-net-library", - "spdx_license_expression": "LicenseRef-scancode-ms-net-library", + "license_expression_spdx": "LicenseRef-scancode-ms-net-library", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/nuget/Microsoft.AspNet.Mvc.nuspec.json.expected b/tests/packagedcode/data/nuget/Microsoft.AspNet.Mvc.nuspec.json.expected index 222740f515..f5333801bb 100644 --- a/tests/packagedcode/data/nuget/Microsoft.AspNet.Mvc.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/Microsoft.AspNet.Mvc.nuspec.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "ms-net-library", - "spdx_license_expression": "LicenseRef-scancode-ms-net-library", + "license_expression_spdx": "LicenseRef-scancode-ms-net-library", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/nuget/Microsoft.Net.Http.nuspec.json.expected b/tests/packagedcode/data/nuget/Microsoft.Net.Http.nuspec.json.expected index 1644b19ab1..1dc124edce 100644 --- a/tests/packagedcode/data/nuget/Microsoft.Net.Http.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/Microsoft.Net.Http.nuspec.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "ms-net-library-2018-11", - "spdx_license_expression": "LicenseRef-scancode-ms-net-library-2018-11", + "license_expression_spdx": "LicenseRef-scancode-ms-net-library-2018-11", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected b/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected index 8e2dd3dfa7..e189074c5e 100644 --- a/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/bootstrap.nuspec.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/nuget/jQuery.UI.Combined.nuspec.json.expected b/tests/packagedcode/data/nuget/jQuery.UI.Combined.nuspec.json.expected index e4379fa9b3..9c766ebb03 100644 --- a/tests/packagedcode/data/nuget/jQuery.UI.Combined.nuspec.json.expected +++ b/tests/packagedcode/data/nuget/jQuery.UI.Combined.nuspec.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/opam/sample1/output.opam.expected b/tests/packagedcode/data/opam/sample1/output.opam.expected index 3c26464dad..12daca0bdb 100644 --- a/tests/packagedcode/data/opam/sample1/output.opam.expected +++ b/tests/packagedcode/data/opam/sample1/output.opam.expected @@ -117,7 +117,7 @@ "matches": [ { "license_expression": "isc", - "spdx_license_expression": "ISC", + "license_expression_spdx": "ISC", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/opam/sample3/output.opam.expected b/tests/packagedcode/data/opam/sample3/output.opam.expected index 3b5d9f7c53..be0724cfa9 100644 --- a/tests/packagedcode/data/opam/sample3/output.opam.expected +++ b/tests/packagedcode/data/opam/sample3/output.opam.expected @@ -61,7 +61,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/opam/sample4/output.opam.expected b/tests/packagedcode/data/opam/sample4/output.opam.expected index 3b311d2e24..28b370c0fe 100644 --- a/tests/packagedcode/data/opam/sample4/output.opam.expected +++ b/tests/packagedcode/data/opam/sample4/output.opam.expected @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception", - "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception", + "license_expression_spdx": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/opam/sample5/output.opam.expected b/tests/packagedcode/data/opam/sample5/output.opam.expected index 1c274196e6..23599cbd74 100644 --- a/tests/packagedcode/data/opam/sample5/output.opam.expected +++ b/tests/packagedcode/data/opam/sample5/output.opam.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/opam/sample6/output.opam.expected b/tests/packagedcode/data/opam/sample6/output.opam.expected index f6a1ae498f..c68352d323 100644 --- a/tests/packagedcode/data/opam/sample6/output.opam.expected +++ b/tests/packagedcode/data/opam/sample6/output.opam.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/opam/sample7/output.opam.expected b/tests/packagedcode/data/opam/sample7/output.opam.expected index dab574ab82..dbb399d788 100644 --- a/tests/packagedcode/data/opam/sample7/output.opam.expected +++ b/tests/packagedcode/data/opam/sample7/output.opam.expected @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception", - "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception", + "license_expression_spdx": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/opam/sample8/output.opam.expected b/tests/packagedcode/data/opam/sample8/output.opam.expected index 3b311d2e24..28b370c0fe 100644 --- a/tests/packagedcode/data/opam/sample8/output.opam.expected +++ b/tests/packagedcode/data/opam/sample8/output.opam.expected @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "lgpl-3.0 WITH ocaml-lgpl-linking-exception", - "spdx_license_expression": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception", + "license_expression_spdx": "LGPL-3.0-only WITH OCaml-LGPL-linking-exception", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected b/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected index f27e9057e1..f9d24df965 100644 --- a/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/phpcomposer/composer.lock-expected.json b/tests/packagedcode/data/phpcomposer/composer.lock-expected.json index 4050041e6d..787c71fbc8 100644 --- a/tests/packagedcode/data/phpcomposer/composer.lock-expected.json +++ b/tests/packagedcode/data/phpcomposer/composer.lock-expected.json @@ -450,7 +450,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -588,7 +588,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -715,7 +715,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -853,7 +853,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -1002,7 +1002,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -1114,7 +1114,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -1340,7 +1340,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -1459,7 +1459,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -1567,7 +1567,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -1683,7 +1683,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -1827,7 +1827,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -1968,7 +1968,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -2080,7 +2080,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -2515,7 +2515,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -2645,7 +2645,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -2754,7 +2754,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -2892,7 +2892,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -2986,7 +2986,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -3131,7 +3131,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -3397,7 +3397,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -3531,7 +3531,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -3720,7 +3720,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -3832,7 +3832,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -3933,7 +3933,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -4034,7 +4034,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -4146,7 +4146,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -4258,7 +4258,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -4370,7 +4370,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -4471,7 +4471,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -4572,7 +4572,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/phpcomposer/fake/composer.json.expected b/tests/packagedcode/data/phpcomposer/fake/composer.json.expected index eaeec67753..26a92cc264 100644 --- a/tests/packagedcode/data/phpcomposer/fake/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/fake/composer.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "lgpl-2.1 OR gpl-3.0-plus", - "spdx_license_expression": "LGPL-2.1-only OR GPL-3.0-or-later", + "license_expression_spdx": "LGPL-2.1-only OR GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected b/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected index e444a69fa7..76c318bba7 100644 --- a/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/fake2/composer.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -69,7 +69,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/phpcomposer/framework/composer.json.expected b/tests/packagedcode/data/phpcomposer/framework/composer.json.expected index 1703b95eaf..48c988888a 100644 --- a/tests/packagedcode/data/phpcomposer/framework/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/framework/composer.json.expected @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/phpcomposer/modern/composer.json.expected b/tests/packagedcode/data/phpcomposer/modern/composer.json.expected index 92fe93322f..0c029dea2b 100644 --- a/tests/packagedcode/data/phpcomposer/modern/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/modern/composer.json.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "proprietary-license", - "spdx_license_expression": "LicenseRef-scancode-proprietary-license", + "license_expression_spdx": "LicenseRef-scancode-proprietary-license", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/phpcomposer/slim/composer.json.expected b/tests/packagedcode/data/phpcomposer/slim/composer.json.expected index 8105626af5..79eb77e61f 100644 --- a/tests/packagedcode/data/phpcomposer/slim/composer.json.expected +++ b/tests/packagedcode/data/phpcomposer/slim/composer.json.expected @@ -68,7 +68,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/about-package-expected.json b/tests/packagedcode/data/plugin/about-package-expected.json index 7b4c9cff4b..3e7408e7dc 100644 --- a/tests/packagedcode/data/plugin/about-package-expected.json +++ b/tests/packagedcode/data/plugin/about-package-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "aboutfiles/apipkg.ABOUT", "start_line": 1, "end_line": 1, @@ -120,7 +120,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "aboutfiles/appdirs.ABOUT", "start_line": 1, "end_line": 1, @@ -227,7 +227,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "aboutfiles/apipkg.ABOUT", "start_line": 1, "end_line": 1, @@ -322,7 +322,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "aboutfiles/appdirs.ABOUT", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/bower-package-expected.json b/tests/packagedcode/data/plugin/bower-package-expected.json index a1afb09cae..98a4c15c95 100644 --- a/tests/packagedcode/data/plugin/bower-package-expected.json +++ b/tests/packagedcode/data/plugin/bower-package-expected.json @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/bower.json", "start_line": 1, "end_line": 1, @@ -181,7 +181,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/bower.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/cargo-package-expected.json b/tests/packagedcode/data/plugin/cargo-package-expected.json index 511ea7c31b..f2151dcbd9 100644 --- a/tests/packagedcode/data/plugin/cargo-package-expected.json +++ b/tests/packagedcode/data/plugin/cargo-package-expected.json @@ -48,7 +48,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/Cargo.toml", "start_line": 1, "end_line": 1, @@ -336,7 +336,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/Cargo.toml", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/chef-package-expected.json b/tests/packagedcode/data/plugin/chef-package-expected.json index 0848f35f3b..f58b9226dd 100644 --- a/tests/packagedcode/data/plugin/chef-package-expected.json +++ b/tests/packagedcode/data/plugin/chef-package-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/metadata.rb", "start_line": 1, "end_line": 1, @@ -63,7 +63,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/metadata.json", "start_line": 1, "end_line": 1, @@ -182,7 +182,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/metadata.json", "start_line": 1, "end_line": 1, @@ -279,7 +279,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/metadata.rb", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/com-package-expected.json b/tests/packagedcode/data/plugin/com-package-expected.json index 0b9fa60003..70709a1ec1 100644 --- a/tests/packagedcode/data/plugin/com-package-expected.json +++ b/tests/packagedcode/data/plugin/com-package-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "chcp.com", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/conda-package-expected.json b/tests/packagedcode/data/plugin/conda-package-expected.json index a997672e28..3958d5888d 100644 --- a/tests/packagedcode/data/plugin/conda-package-expected.json +++ b/tests/packagedcode/data/plugin/conda-package-expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "package/info/recipe.tar-extract/recipe/meta.yaml", "start_line": 1, "end_line": 1, @@ -319,7 +319,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "package/info/recipe.tar-extract/recipe/meta.yaml", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/cran-package-expected.json b/tests/packagedcode/data/plugin/cran-package-expected.json index 091e36f616..c5b827f593 100644 --- a/tests/packagedcode/data/plugin/cran-package-expected.json +++ b/tests/packagedcode/data/plugin/cran-package-expected.json @@ -48,7 +48,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "package/DESCRIPTION", "start_line": 1, "end_line": 1, @@ -157,7 +157,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "package/DESCRIPTION", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/freebsd-package-expected.json b/tests/packagedcode/data/plugin/freebsd-package-expected.json index b4a0d41ae3..514923e3e8 100644 --- a/tests/packagedcode/data/plugin/freebsd-package-expected.json +++ b/tests/packagedcode/data/plugin/freebsd-package-expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "package/+COMPACT_MANIFEST", "start_line": 1, "end_line": 1, @@ -137,7 +137,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "package/+COMPACT_MANIFEST", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/get_installed_packages-expected.json b/tests/packagedcode/data/plugin/get_installed_packages-expected.json index 7430cfa47b..c9269befa2 100644 --- a/tests/packagedcode/data/plugin/get_installed_packages-expected.json +++ b/tests/packagedcode/data/plugin/get_installed_packages-expected.json @@ -44,7 +44,7 @@ "matches": [ { "license_expression": "x11-fsf", - "spdx_license_expression": "X11-distribute-modifications-variant", + "license_expression_spdx": "X11-distribute-modifications-variant", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 23, "end_line": 45, @@ -66,7 +66,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 50, "end_line": 70, @@ -88,7 +88,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 76, "end_line": 98, @@ -110,7 +110,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 105, "end_line": 127, @@ -230,7 +230,7 @@ "matches": [ { "license_expression": "x11-fsf", - "spdx_license_expression": "X11-distribute-modifications-variant", + "license_expression_spdx": "X11-distribute-modifications-variant", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 23, "end_line": 45, @@ -252,7 +252,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 50, "end_line": 70, @@ -274,7 +274,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 76, "end_line": 98, @@ -296,7 +296,7 @@ "matches": [ { "license_expression": "x11-xconsortium", - "spdx_license_expression": "X11", + "license_expression_spdx": "X11", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libncurses5/copyright", "start_line": 105, "end_line": 127, @@ -480,7 +480,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 13, "end_line": 13, @@ -495,7 +495,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 14, "end_line": 26, @@ -510,7 +510,7 @@ }, { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 24, "end_line": 30, @@ -612,7 +612,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 13, "end_line": 13, @@ -627,7 +627,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 14, "end_line": 26, @@ -642,7 +642,7 @@ }, { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "basic-rootfs.tar.gz/usr/share/doc/libndp0/copyright", "start_line": 24, "end_line": 30, diff --git a/tests/packagedcode/data/plugin/haxe-package-expected.json b/tests/packagedcode/data/plugin/haxe-package-expected.json index 45e26cc730..071e3ac523 100644 --- a/tests/packagedcode/data/plugin/haxe-package-expected.json +++ b/tests/packagedcode/data/plugin/haxe-package-expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/haxelib.json", "start_line": 1, "end_line": 1, @@ -137,7 +137,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/haxelib.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/maven-package-expected.json b/tests/packagedcode/data/plugin/maven-package-expected.json index 35ae051646..91b4cdcb01 100644 --- a/tests/packagedcode/data/plugin/maven-package-expected.json +++ b/tests/packagedcode/data/plugin/maven-package-expected.json @@ -233,7 +233,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom", "start_line": 1, "end_line": 1, @@ -248,7 +248,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom", "start_line": 2, "end_line": 2, @@ -775,7 +775,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom", "start_line": 1, "end_line": 2, @@ -1013,7 +1013,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom", "start_line": 1, "end_line": 1, @@ -1194,7 +1194,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "maven2/foo-pom/foo-pom.xml", "start_line": 1, "end_line": 1, @@ -1209,7 +1209,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "maven2/foo-pom/foo-pom.xml", "start_line": 2, "end_line": 2, @@ -1419,7 +1419,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "start_line": 1, "end_line": 1, @@ -1434,7 +1434,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "start_line": 2, "end_line": 2, @@ -1515,7 +1515,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/log4j/log4j-pom.xml", "start_line": 1, "end_line": 2, @@ -1588,7 +1588,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/logback-access/logback-access.pom", "start_line": 1, "end_line": 1, @@ -1603,7 +1603,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/logback-access/logback-access.pom", "start_line": 2, "end_line": 2, @@ -2091,7 +2091,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-2.5.4/spring-2.5.4.pom", "start_line": 1, "end_line": 2, @@ -2172,7 +2172,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom", "start_line": 1, "end_line": 2, @@ -2253,7 +2253,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom", "start_line": 1, "end_line": 2, @@ -7012,7 +7012,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom", "start_line": 1, "end_line": 1, @@ -7027,7 +7027,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom", "start_line": 2, "end_line": 2, @@ -7709,7 +7709,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom", "start_line": 1, "end_line": 2, @@ -8312,7 +8312,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom", "start_line": 1, "end_line": 1, @@ -8837,7 +8837,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "maven2/foo-pom/foo-pom.xml", "start_line": 1, "end_line": 1, @@ -8852,7 +8852,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "maven2/foo-pom/foo-pom.xml", "start_line": 2, "end_line": 2, @@ -9307,7 +9307,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "start_line": 1, "end_line": 1, @@ -9322,7 +9322,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "start_line": 2, "end_line": 2, @@ -9481,7 +9481,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/log4j/log4j-pom.xml", "start_line": 1, "end_line": 2, @@ -9654,7 +9654,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/logback-access/logback-access.pom", "start_line": 1, "end_line": 1, @@ -9669,7 +9669,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/logback-access/logback-access.pom", "start_line": 2, "end_line": 2, @@ -11021,7 +11021,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-2.5.4/spring-2.5.4.pom", "start_line": 1, "end_line": 2, @@ -11851,7 +11851,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom", "start_line": 1, "end_line": 2, @@ -12142,7 +12142,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom", "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/plugin/maven-package-with-license-expected.json b/tests/packagedcode/data/plugin/maven-package-with-license-expected.json index 35ae051646..91b4cdcb01 100644 --- a/tests/packagedcode/data/plugin/maven-package-with-license-expected.json +++ b/tests/packagedcode/data/plugin/maven-package-with-license-expected.json @@ -233,7 +233,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom", "start_line": 1, "end_line": 1, @@ -248,7 +248,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom", "start_line": 2, "end_line": 2, @@ -775,7 +775,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom", "start_line": 1, "end_line": 2, @@ -1013,7 +1013,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom", "start_line": 1, "end_line": 1, @@ -1194,7 +1194,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "maven2/foo-pom/foo-pom.xml", "start_line": 1, "end_line": 1, @@ -1209,7 +1209,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "maven2/foo-pom/foo-pom.xml", "start_line": 2, "end_line": 2, @@ -1419,7 +1419,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "start_line": 1, "end_line": 1, @@ -1434,7 +1434,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "start_line": 2, "end_line": 2, @@ -1515,7 +1515,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/log4j/log4j-pom.xml", "start_line": 1, "end_line": 2, @@ -1588,7 +1588,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/logback-access/logback-access.pom", "start_line": 1, "end_line": 1, @@ -1603,7 +1603,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/logback-access/logback-access.pom", "start_line": 2, "end_line": 2, @@ -2091,7 +2091,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-2.5.4/spring-2.5.4.pom", "start_line": 1, "end_line": 2, @@ -2172,7 +2172,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom", "start_line": 1, "end_line": 2, @@ -2253,7 +2253,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom", "start_line": 1, "end_line": 2, @@ -7012,7 +7012,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom", "start_line": 1, "end_line": 1, @@ -7027,7 +7027,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "maven2/aopalliance-1.0/aopalliance-1.0.pom", "start_line": 2, "end_line": 2, @@ -7709,7 +7709,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/commons-validator-1.2.0/commons-validator-1.2.0.pom", "start_line": 1, "end_line": 2, @@ -8312,7 +8312,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "maven2/findbugs-maven-plugin-1.1.1/findbugs-maven-plugin-1.1.1.pom", "start_line": 1, "end_line": 1, @@ -8837,7 +8837,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "maven2/foo-pom/foo-pom.xml", "start_line": 1, "end_line": 1, @@ -8852,7 +8852,7 @@ }, { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": "maven2/foo-pom/foo-pom.xml", "start_line": 2, "end_line": 2, @@ -9307,7 +9307,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "start_line": 1, "end_line": 1, @@ -9322,7 +9322,7 @@ }, { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "maven2/jrecordbind-2.3.4/jrecordbind-2.3.4.pom", "start_line": 2, "end_line": 2, @@ -9481,7 +9481,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/log4j/log4j-pom.xml", "start_line": 1, "end_line": 2, @@ -9654,7 +9654,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/logback-access/logback-access.pom", "start_line": 1, "end_line": 1, @@ -9669,7 +9669,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "maven2/logback-access/logback-access.pom", "start_line": 2, "end_line": 2, @@ -11021,7 +11021,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-2.5.4/spring-2.5.4.pom", "start_line": 1, "end_line": 2, @@ -11851,7 +11851,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-orm-2.5.3/spring-orm-2.5.3.pom", "start_line": 1, "end_line": 2, @@ -12142,7 +12142,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "maven2/spring-webmvc-2.5.3/spring-webmvc-2.5.3.pom", "start_line": 1, "end_line": 2, diff --git a/tests/packagedcode/data/plugin/mui-package-expected.json b/tests/packagedcode/data/plugin/mui-package-expected.json index f7fd60e9de..d00ea04352 100644 --- a/tests/packagedcode/data/plugin/mui-package-expected.json +++ b/tests/packagedcode/data/plugin/mui-package-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "clfs.sys.mui", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/mun-package-expected.json b/tests/packagedcode/data/plugin/mun-package-expected.json index 77319e6ebd..72a5fb4810 100644 --- a/tests/packagedcode/data/plugin/mun-package-expected.json +++ b/tests/packagedcode/data/plugin/mun-package-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "crypt32.dll.mun", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/nuget-package-expected.json b/tests/packagedcode/data/plugin/nuget-package-expected.json index 0df6c8e084..f33d39a3cf 100644 --- a/tests/packagedcode/data/plugin/nuget-package-expected.json +++ b/tests/packagedcode/data/plugin/nuget-package-expected.json @@ -48,7 +48,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package/Castle.Core.nuspec", "start_line": 1, "end_line": 1, @@ -322,7 +322,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package/Castle.Core.nuspec", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/phpcomposer-package-expected.json b/tests/packagedcode/data/plugin/phpcomposer-package-expected.json index de27e6e8bc..22f7fb58ab 100644 --- a/tests/packagedcode/data/plugin/phpcomposer-package-expected.json +++ b/tests/packagedcode/data/plugin/phpcomposer-package-expected.json @@ -48,7 +48,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/composer.json", "start_line": 1, "end_line": 1, @@ -187,7 +187,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/composer.json", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/python-package-expected.json b/tests/packagedcode/data/plugin/python-package-expected.json index 15c100b59b..50754e1dc0 100644 --- a/tests/packagedcode/data/plugin/python-package-expected.json +++ b/tests/packagedcode/data/plugin/python-package-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "bsd-simplified", - "spdx_license_expression": "BSD-2-Clause", + "license_expression_spdx": "BSD-2-Clause", "from_file": "pypi/arpy/setup.py", "start_line": 1, "end_line": 1, @@ -128,7 +128,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi/atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl", "start_line": 1, "end_line": 1, @@ -150,7 +150,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi/atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl", "start_line": 1, "end_line": 1, @@ -221,7 +221,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi/Six/metadata.json", "start_line": 1, "end_line": 1, @@ -306,7 +306,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi/Six/Six.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -328,7 +328,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi/Six/Six.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -407,7 +407,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/TicketImport/PKG-INFO", "start_line": 1, "end_line": 1, @@ -854,7 +854,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi/Six/Six.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -876,7 +876,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi/Six/Six.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -953,7 +953,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi/Six/metadata.json", "start_line": 1, "end_line": 1, @@ -1045,7 +1045,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "pypi/TicketImport/PKG-INFO", "start_line": 1, "end_line": 1, @@ -1137,7 +1137,7 @@ "matches": [ { "license_expression": "bsd-simplified", - "spdx_license_expression": "BSD-2-Clause", + "license_expression_spdx": "BSD-2-Clause", "from_file": "pypi/arpy/setup.py", "start_line": 1, "end_line": 1, @@ -1477,7 +1477,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi/atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl", "start_line": 1, "end_line": 1, @@ -1499,7 +1499,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pypi/atomicwrites/atomicwrites-1.2.1-py2.py3-none-any.whl", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/rpm-package-expected.json b/tests/packagedcode/data/plugin/rpm-package-expected.json index 95da6aca84..b8dbf0aefd 100644 --- a/tests/packagedcode/data/plugin/rpm-package-expected.json +++ b/tests/packagedcode/data/plugin/rpm-package-expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "package/alfandega-2.0-1.7.3.noarch.rpm", "start_line": 1, "end_line": 1, @@ -113,7 +113,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "package/alfandega-2.0-1.7.3.noarch.rpm", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/rubygems-package-expected.json b/tests/packagedcode/data/plugin/rubygems-package-expected.json index 12da536479..d72c1b66d4 100644 --- a/tests/packagedcode/data/plugin/rubygems-package-expected.json +++ b/tests/packagedcode/data/plugin/rubygems-package-expected.json @@ -62,7 +62,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/m2r-2.1.0.gem", "start_line": 1, "end_line": 1, @@ -365,7 +365,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "package/m2r-2.1.0.gem", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/sys-package-expected.json b/tests/packagedcode/data/plugin/sys-package-expected.json index 88ab475212..b260d4e50c 100644 --- a/tests/packagedcode/data/plugin/sys-package-expected.json +++ b/tests/packagedcode/data/plugin/sys-package-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "tbs.sys", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/tlb-package-expected.json b/tests/packagedcode/data/plugin/tlb-package-expected.json index 86e9812234..98a62e5928 100644 --- a/tests/packagedcode/data/plugin/tlb-package-expected.json +++ b/tests/packagedcode/data/plugin/tlb-package-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "stdole2.tlb", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/win_pe-package-expected.json b/tests/packagedcode/data/plugin/win_pe-package-expected.json index 6f3870028e..6af58be0d4 100644 --- a/tests/packagedcode/data/plugin/win_pe-package-expected.json +++ b/tests/packagedcode/data/plugin/win_pe-package-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "bsd-simplified-darwin", - "spdx_license_expression": "BSD-2-Clause-Darwin", + "license_expression_spdx": "BSD-2-Clause-Darwin", "from_file": "file.exe", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/plugin/winmd-package-expected.json b/tests/packagedcode/data/plugin/winmd-package-expected.json index cf1820cc3d..062e1846fa 100644 --- a/tests/packagedcode/data/plugin/winmd-package-expected.json +++ b/tests/packagedcode/data/plugin/winmd-package-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "Windows.AI.winmd", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/archive/atomicwrites-1.2.1-py2.py3-none-any.whl-expected.json b/tests/packagedcode/data/pypi/archive/atomicwrites-1.2.1-py2.py3-none-any.whl-expected.json index b25d80793e..98261e60a2 100644 --- a/tests/packagedcode/data/pypi/archive/atomicwrites-1.2.1-py2.py3-none-any.whl-expected.json +++ b/tests/packagedcode/data/pypi/archive/atomicwrites-1.2.1-py2.py3-none-any.whl-expected.json @@ -48,7 +48,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -70,7 +70,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/archive/commoncode-21.5.12-py3.9.egg-expected.json b/tests/packagedcode/data/pypi/archive/commoncode-21.5.12-py3.9.egg-expected.json index 48926b04be..a3c1d59ac8 100644 --- a/tests/packagedcode/data/pypi/archive/commoncode-21.5.12-py3.9.egg-expected.json +++ b/tests/packagedcode/data/pypi/archive/commoncode-21.5.12-py3.9.egg-expected.json @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/deplock/simple/pip-inspect.deplock-expected.json b/tests/packagedcode/data/pypi/deplock/simple/pip-inspect.deplock-expected.json index 4c91475052..0613b7976e 100644 --- a/tests/packagedcode/data/pypi/deplock/simple/pip-inspect.deplock-expected.json +++ b/tests/packagedcode/data/pypi/deplock/simple/pip-inspect.deplock-expected.json @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "apache-2.0 AND bsd-new AND mit", - "spdx_license_expression": "Apache-2.0 AND BSD-3-Clause AND MIT", + "license_expression_spdx": "Apache-2.0 AND BSD-3-Clause AND MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -104,7 +104,7 @@ "matches": [ { "license_expression": "bsd-simplified OR apache-2.0", - "spdx_license_expression": "BSD-2-Clause OR Apache-2.0", + "license_expression_spdx": "BSD-2-Clause OR Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/deplock/univers/pip-inspect.deplock-expected.json b/tests/packagedcode/data/pypi/deplock/univers/pip-inspect.deplock-expected.json index 4882842faf..a3dcf9b9e8 100644 --- a/tests/packagedcode/data/pypi/deplock/univers/pip-inspect.deplock-expected.json +++ b/tests/packagedcode/data/pypi/deplock/univers/pip-inspect.deplock-expected.json @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "apache-2.0 AND bsd-new AND mit", - "spdx_license_expression": "Apache-2.0 AND BSD-3-Clause AND MIT", + "license_expression_spdx": "Apache-2.0 AND BSD-3-Clause AND MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -125,7 +125,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -544,7 +544,7 @@ "matches": [ { "license_expression": "bsd-simplified OR apache-2.0", - "spdx_license_expression": "BSD-2-Clause OR Apache-2.0", + "license_expression_spdx": "BSD-2-Clause OR Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -633,7 +633,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -710,7 +710,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -791,7 +791,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -868,7 +868,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/develop/scancode_toolkit.egg-info-expected.json b/tests/packagedcode/data/pypi/develop/scancode_toolkit.egg-info-expected.json index bd00cbb9eb..ce88678abd 100644 --- a/tests/packagedcode/data/pypi/develop/scancode_toolkit.egg-info-expected.json +++ b/tests/packagedcode/data/pypi/develop/scancode_toolkit.egg-info-expected.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft", - "spdx_license_expression": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft", + "license_expression_spdx": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/dist-info-metadata/METADATA-expected.json b/tests/packagedcode/data/pypi/dist-info-metadata/METADATA-expected.json index 82a7bf54c1..e1b1189c7a 100644 --- a/tests/packagedcode/data/pypi/dist-info-metadata/METADATA-expected.json +++ b/tests/packagedcode/data/pypi/dist-info-metadata/METADATA-expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -68,7 +68,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json b/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json index 9fb7971017..e4d8fe2859 100644 --- a/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/PKG-INFO-expected.json @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/metadata/v10/PKG-INFO-expected.json b/tests/packagedcode/data/pypi/metadata/v10/PKG-INFO-expected.json index 160e74bfc6..103d73ccd6 100644 --- a/tests/packagedcode/data/pypi/metadata/v10/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/v10/PKG-INFO-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/metadata/v11/PKG-INFO-expected.json b/tests/packagedcode/data/pypi/metadata/v11/PKG-INFO-expected.json index 9fb7971017..e4d8fe2859 100644 --- a/tests/packagedcode/data/pypi/metadata/v11/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/v11/PKG-INFO-expected.json @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/metadata/v12/PKG-INFO-expected.json b/tests/packagedcode/data/pypi/metadata/v12/PKG-INFO-expected.json index 82108137d3..e985c26402 100644 --- a/tests/packagedcode/data/pypi/metadata/v12/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/v12/PKG-INFO-expected.json @@ -61,7 +61,7 @@ "matches": [ { "license_expression": "python", - "spdx_license_expression": "Python-2.0", + "license_expression_spdx": "Python-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -83,7 +83,7 @@ "matches": [ { "license_expression": "python", - "spdx_license_expression": "Python-2.0", + "license_expression_spdx": "Python-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/metadata/v20/PKG-INFO-expected.json b/tests/packagedcode/data/pypi/metadata/v20/PKG-INFO-expected.json index bf6b9e1ceb..2a81b0d29d 100644 --- a/tests/packagedcode/data/pypi/metadata/v20/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/v20/PKG-INFO-expected.json @@ -61,7 +61,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -83,7 +83,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/metadata/v21/PKG-INFO-expected.json b/tests/packagedcode/data/pypi/metadata/v21/PKG-INFO-expected.json index 7b43d6b292..f807541141 100644 --- a/tests/packagedcode/data/pypi/metadata/v21/PKG-INFO-expected.json +++ b/tests/packagedcode/data/pypi/metadata/v21/PKG-INFO-expected.json @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/more_setup.py/flask_setup.py-expected.json b/tests/packagedcode/data/pypi/more_setup.py/flask_setup.py-expected.json index 2b0bb7afec..9b3c9a3ccd 100644 --- a/tests/packagedcode/data/pypi/more_setup.py/flask_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/more_setup.py/flask_setup.py-expected.json @@ -64,7 +64,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -86,7 +86,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/more_setup.py/pyyaml_setup.py-expected.json b/tests/packagedcode/data/pypi/more_setup.py/pyyaml_setup.py-expected.json index f13648ce6d..963ec2fcb8 100644 --- a/tests/packagedcode/data/pypi/more_setup.py/pyyaml_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/more_setup.py/pyyaml_setup.py-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/more_setup.py/requests_setup.py-expected.json b/tests/packagedcode/data/pypi/more_setup.py/requests_setup.py-expected.json index 2fe887c68d..5f4168d50b 100644 --- a/tests/packagedcode/data/pypi/more_setup.py/requests_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/more_setup.py/requests_setup.py-expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/more_setup.py/sqlalchemy_setup.py-expected.json b/tests/packagedcode/data/pypi/more_setup.py/sqlalchemy_setup.py-expected.json index ea5213a56e..3cb286629f 100644 --- a/tests/packagedcode/data/pypi/more_setup.py/sqlalchemy_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/more_setup.py/sqlalchemy_setup.py-expected.json @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -71,7 +71,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/more_setup.py/unpack_kwargs_setup.py-expected.json b/tests/packagedcode/data/pypi/more_setup.py/unpack_kwargs_setup.py-expected.json index 4126b658e8..0b284aaae5 100644 --- a/tests/packagedcode/data/pypi/more_setup.py/unpack_kwargs_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/more_setup.py/unpack_kwargs_setup.py-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/poetry/univers-package-assembly-expected.json b/tests/packagedcode/data/pypi/poetry/univers-package-assembly-expected.json index f55e2656c3..4f0b49841b 100644 --- a/tests/packagedcode/data/pypi/poetry/univers-package-assembly-expected.json +++ b/tests/packagedcode/data/pypi/poetry/univers-package-assembly-expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "univers/pyproject.toml", "start_line": 1, "end_line": 1, @@ -1899,7 +1899,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "univers/pyproject.toml", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/poetry/univers-pyproject.toml-expected.json b/tests/packagedcode/data/pypi/poetry/univers-pyproject.toml-expected.json index 2195e6f01b..be1c275253 100644 --- a/tests/packagedcode/data/pypi/poetry/univers-pyproject.toml-expected.json +++ b/tests/packagedcode/data/pypi/poetry/univers-pyproject.toml-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/pyproject-toml/poetry/connexion-pyproject.toml-expected.json b/tests/packagedcode/data/pypi/pyproject-toml/poetry/connexion-pyproject.toml-expected.json index 21dfd723f9..7730eba5ae 100644 --- a/tests/packagedcode/data/pypi/pyproject-toml/poetry/connexion-pyproject.toml-expected.json +++ b/tests/packagedcode/data/pypi/pyproject-toml/poetry/connexion-pyproject.toml-expected.json @@ -104,7 +104,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -126,7 +126,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/pyproject-toml/poetry/gerapy-pyproject.toml-expected.json b/tests/packagedcode/data/pypi/pyproject-toml/poetry/gerapy-pyproject.toml-expected.json index 438229ed5f..31160482d9 100644 --- a/tests/packagedcode/data/pypi/pyproject-toml/poetry/gerapy-pyproject.toml-expected.json +++ b/tests/packagedcode/data/pypi/pyproject-toml/poetry/gerapy-pyproject.toml-expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -68,7 +68,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/pyproject-toml/poetry/gino-pyproject.toml-expected.json b/tests/packagedcode/data/pypi/pyproject-toml/poetry/gino-pyproject.toml-expected.json index 91f82921e4..fc20e73fb0 100644 --- a/tests/packagedcode/data/pypi/pyproject-toml/poetry/gino-pyproject.toml-expected.json +++ b/tests/packagedcode/data/pypi/pyproject-toml/poetry/gino-pyproject.toml-expected.json @@ -68,7 +68,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -90,7 +90,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/pyproject-toml/standard/apache-airflow-pyclient-pyproject.toml-expected.json b/tests/packagedcode/data/pypi/pyproject-toml/standard/apache-airflow-pyclient-pyproject.toml-expected.json index f2d3bf81a3..e10b6eedd0 100644 --- a/tests/packagedcode/data/pypi/pyproject-toml/standard/apache-airflow-pyclient-pyproject.toml-expected.json +++ b/tests/packagedcode/data/pypi/pyproject-toml/standard/apache-airflow-pyclient-pyproject.toml-expected.json @@ -56,7 +56,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/pyproject-toml/standard/apache-airflow-pyproject.toml-expected.json b/tests/packagedcode/data/pypi/pyproject-toml/standard/apache-airflow-pyproject.toml-expected.json index e0f1d437db..a03f2a8f13 100644 --- a/tests/packagedcode/data/pypi/pyproject-toml/standard/apache-airflow-pyproject.toml-expected.json +++ b/tests/packagedcode/data/pypi/pyproject-toml/standard/apache-airflow-pyproject.toml-expected.json @@ -67,7 +67,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/pyproject-toml/standard/attrs-pyproject.toml-expected.json b/tests/packagedcode/data/pypi/pyproject-toml/standard/attrs-pyproject.toml-expected.json index d3833aeea5..6531dc3357 100644 --- a/tests/packagedcode/data/pypi/pyproject-toml/standard/attrs-pyproject.toml-expected.json +++ b/tests/packagedcode/data/pypi/pyproject-toml/standard/attrs-pyproject.toml-expected.json @@ -55,7 +55,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -77,7 +77,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/pyproject-toml/standard/flask-pyproject.toml-expected.json b/tests/packagedcode/data/pypi/pyproject-toml/standard/flask-pyproject.toml-expected.json index f05c323c2a..02f6641bf4 100644 --- a/tests/packagedcode/data/pypi/pyproject-toml/standard/flask-pyproject.toml-expected.json +++ b/tests/packagedcode/data/pypi/pyproject-toml/standard/flask-pyproject.toml-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.cfg/wheel-0.34.2/setup.cfg-expected.json b/tests/packagedcode/data/pypi/setup.cfg/wheel-0.34.2/setup.cfg-expected.json index c73ef3295c..640df5b609 100644 --- a/tests/packagedcode/data/pypi/setup.cfg/wheel-0.34.2/setup.cfg-expected.json +++ b/tests/packagedcode/data/pypi/setup.cfg/wheel-0.34.2/setup.cfg-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-name-or-no-name/with_name-setup.py.expected.json b/tests/packagedcode/data/pypi/setup.py-name-or-no-name/with_name-setup.py.expected.json index 71dd42fdde..1bbe85cafc 100644 --- a/tests/packagedcode/data/pypi/setup.py-name-or-no-name/with_name-setup.py.expected.json +++ b/tests/packagedcode/data/pypi/setup.py-name-or-no-name/with_name-setup.py.expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "bsd-simplified", - "spdx_license_expression": "BSD-2-Clause", + "license_expression_spdx": "BSD-2-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-not-win/arpy_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-not-win/arpy_setup.py-expected.json index 71dd42fdde..1bbe85cafc 100644 --- a/tests/packagedcode/data/pypi/setup.py-not-win/arpy_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-not-win/arpy_setup.py-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "bsd-simplified", - "spdx_license_expression": "BSD-2-Clause", + "license_expression_spdx": "BSD-2-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/cdp-seattle-backend-1.0.0/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/cdp-seattle-backend-1.0.0/setup.py-expected.json index 992db387f3..ac18aee293 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/cdp-seattle-backend-1.0.0/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/cdp-seattle-backend-1.0.0/setup.py-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -69,7 +69,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/certifi-2020.6.20/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/certifi-2020.6.20/setup.py-expected.json index c069d58ed4..a6dc352a01 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/certifi-2020.6.20/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/certifi-2020.6.20/setup.py-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/cffi-1.14.0/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/cffi-1.14.0/setup.py-expected.json index a11bab321a..b3235feb9c 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/cffi-1.14.0/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/cffi-1.14.0/setup.py-expected.json @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -75,7 +75,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/chardet-3.0.4/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/chardet-3.0.4/setup.py-expected.json index 95995e79a7..62c144804c 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/chardet-3.0.4/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/chardet-3.0.4/setup.py-expected.json @@ -65,7 +65,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -87,7 +87,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/docutils-0.16/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/docutils-0.16/setup.py-expected.json index 93fc6f467f..5ae78af7a7 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/docutils-0.16/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/docutils-0.16/setup.py-expected.json @@ -90,7 +90,7 @@ "matches": [ { "license_expression": "public-domain AND python AND bsd-simplified AND gpl-3.0", - "spdx_license_expression": "LicenseRef-scancode-public-domain AND Python-2.0 AND BSD-2-Clause AND GPL-3.0-only", + "license_expression_spdx": "LicenseRef-scancode-public-domain AND Python-2.0 AND BSD-2-Clause AND GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -112,7 +112,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, @@ -127,7 +127,7 @@ }, { "license_expression": "python", - "spdx_license_expression": "Python-2.0", + "license_expression_spdx": "Python-2.0", "from_file": null, "start_line": 2, "end_line": 2, @@ -142,7 +142,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 3, "end_line": 3, @@ -157,7 +157,7 @@ }, { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 4, "end_line": 4, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/idna-2.9/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/idna-2.9/setup.py-expected.json index 396e40addc..2bc0ad571a 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/idna-2.9/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/idna-2.9/setup.py-expected.json @@ -59,7 +59,7 @@ "matches": [ { "license_expression": "other-permissive", - "spdx_license_expression": "LicenseRef-scancode-other-permissive", + "license_expression_spdx": "LicenseRef-scancode-other-permissive", "from_file": null, "start_line": 1, "end_line": 1, @@ -81,7 +81,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/paho-mqtt-1.5.0/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/paho-mqtt-1.5.0/setup.py-expected.json index 018f902fcc..427f35a137 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/paho-mqtt-1.5.0/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/paho-mqtt-1.5.0/setup.py-expected.json @@ -57,7 +57,7 @@ "matches": [ { "license_expression": "epl-1.0", - "spdx_license_expression": "EPL-1.0", + "license_expression_spdx": "EPL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -72,7 +72,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -94,7 +94,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/pexpect-4.6.0/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/pexpect-4.6.0/setup.py-expected.json index 4b2ee9be28..8bd14b106f 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/pexpect-4.6.0/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/pexpect-4.6.0/setup.py-expected.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "isc", - "spdx_license_expression": "ISC", + "license_expression_spdx": "ISC", "from_file": null, "start_line": 1, "end_line": 1, @@ -82,7 +82,7 @@ "matches": [ { "license_expression": "isc", - "spdx_license_expression": "ISC", + "license_expression_spdx": "ISC", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/pip-22.0.4/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/pip-22.0.4/setup.py-expected.json index 36610f43f6..06a15f3693 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/pip-22.0.4/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/pip-22.0.4/setup.py-expected.json @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -75,7 +75,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/pycparser-2.20/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/pycparser-2.20/setup.py-expected.json index dd055a8e2e..cf810ca862 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/pycparser-2.20/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/pycparser-2.20/setup.py-expected.json @@ -55,7 +55,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -77,7 +77,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/pyserial-3.4/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/pyserial-3.4/setup.py-expected.json index 9aaa154c64..36513d9dc8 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/pyserial-3.4/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/pyserial-3.4/setup.py-expected.json @@ -61,7 +61,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -83,7 +83,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/pytoml-0.1.21/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/pytoml-0.1.21/setup.py-expected.json index e58bb0fd5d..b7d9a3b8d8 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/pytoml-0.1.21/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/pytoml-0.1.21/setup.py-expected.json @@ -48,7 +48,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -70,7 +70,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/requests-2.24.0/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/requests-2.24.0/setup.py-expected.json index 38eab25c22..7511e22a24 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/requests-2.24.0/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/requests-2.24.0/setup.py-expected.json @@ -46,7 +46,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/setupreader-0.0.3/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/setupreader-0.0.3/setup.py-expected.json index 47c252450f..293fc09085 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/setupreader-0.0.3/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/setupreader-0.0.3/setup.py-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/six-1.14.0/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/six-1.14.0/setup.py-expected.json index d7803cb2bb..39312a1cb3 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/six-1.14.0/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/six-1.14.0/setup.py-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -69,7 +69,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py-versions/urllib3-1.25.9/setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py-versions/urllib3-1.25.9/setup.py-expected.json index 469c64db9c..3efff5c9df 100644 --- a/tests/packagedcode/data/pypi/setup.py-versions/urllib3-1.25.9/setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py-versions/urllib3-1.25.9/setup.py-expected.json @@ -65,7 +65,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -87,7 +87,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/bluepyopt_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/bluepyopt_setup.py-expected.json index 47fee156ca..588ef0a764 100644 --- a/tests/packagedcode/data/pypi/setup.py/bluepyopt_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/bluepyopt_setup.py-expected.json @@ -50,7 +50,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -72,7 +72,7 @@ "matches": [ { "license_expression": "lgpl-3.0", - "spdx_license_expression": "LGPL-3.0-only", + "license_expression_spdx": "LGPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/boolean2_py_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/boolean2_py_setup.py-expected.json index 4372ad27a1..5df303b328 100644 --- a/tests/packagedcode/data/pypi/setup.py/boolean2_py_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/boolean2_py_setup.py-expected.json @@ -55,7 +55,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -77,7 +77,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/complex_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/complex_setup.py-expected.json index 9703c49742..3b654823f7 100644 --- a/tests/packagedcode/data/pypi/setup.py/complex_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/complex_setup.py-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/container_check_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/container_check_setup.py-expected.json index ed00914555..1173a83d86 100644 --- a/tests/packagedcode/data/pypi/setup.py/container_check_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/container_check_setup.py-expected.json @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -76,7 +76,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/fb303_py_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/fb303_py_setup.py-expected.json index fef31a0262..69fcea8ed2 100644 --- a/tests/packagedcode/data/pypi/setup.py/fb303_py_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/fb303_py_setup.py-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/frell_src_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/frell_src_setup.py-expected.json index 76e6627cec..fb22208b4a 100644 --- a/tests/packagedcode/data/pypi/setup.py/frell_src_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/frell_src_setup.py-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/interlap_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/interlap_setup.py-expected.json index 02142c07f5..69a559e06f 100644 --- a/tests/packagedcode/data/pypi/setup.py/interlap_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/interlap_setup.py-expected.json @@ -51,7 +51,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -73,7 +73,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/mb_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/mb_setup.py-expected.json index aa5601b87b..570353f39e 100644 --- a/tests/packagedcode/data/pypi/setup.py/mb_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/mb_setup.py-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/ntfs_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/ntfs_setup.py-expected.json index 2fbf171180..62c77b51d9 100644 --- a/tests/packagedcode/data/pypi/setup.py/ntfs_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/ntfs_setup.py-expected.json @@ -51,7 +51,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -73,7 +73,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/nvchecker_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/nvchecker_setup.py-expected.json index 0f47e19607..4855343778 100644 --- a/tests/packagedcode/data/pypi/setup.py/nvchecker_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/nvchecker_setup.py-expected.json @@ -61,7 +61,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -83,7 +83,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/oi_agents_common_code_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/oi_agents_common_code_setup.py-expected.json index 8d4db41846..2060b4c399 100644 --- a/tests/packagedcode/data/pypi/setup.py/oi_agents_common_code_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/oi_agents_common_code_setup.py-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": null, "start_line": 1, "end_line": 1, @@ -89,7 +89,7 @@ }, { "license_expression": "gpl-3.0", - "spdx_license_expression": "GPL-3.0-only", + "license_expression_spdx": "GPL-3.0-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/packageurl_python_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/packageurl_python_setup.py-expected.json index 0a89e37323..7bc3a28251 100644 --- a/tests/packagedcode/data/pypi/setup.py/packageurl_python_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/packageurl_python_setup.py-expected.json @@ -55,7 +55,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -77,7 +77,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/pipdeptree_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/pipdeptree_setup.py-expected.json index ffb099573c..a2f875dc69 100644 --- a/tests/packagedcode/data/pypi/setup.py/pipdeptree_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/pipdeptree_setup.py-expected.json @@ -50,7 +50,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -72,7 +72,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/pluggy_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/pluggy_setup.py-expected.json index 037769dafe..88cc09cd8b 100644 --- a/tests/packagedcode/data/pypi/setup.py/pluggy_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/pluggy_setup.py-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/pygtrie_with_kwargs_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/pygtrie_with_kwargs_setup.py-expected.json index d076ea29c1..2d6577d47e 100644 --- a/tests/packagedcode/data/pypi/setup.py/pygtrie_with_kwargs_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/pygtrie_with_kwargs_setup.py-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/pyrpm_2_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/pyrpm_2_setup.py-expected.json index 644dc9e9ce..e3b71c241b 100644 --- a/tests/packagedcode/data/pypi/setup.py/pyrpm_2_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/pyrpm_2_setup.py-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/python_publicsuffix_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/python_publicsuffix_setup.py-expected.json index fceb77dbc5..e93b4556c4 100644 --- a/tests/packagedcode/data/pypi/setup.py/python_publicsuffix_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/python_publicsuffix_setup.py-expected.json @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -67,7 +67,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/repology_py_libversion_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/repology_py_libversion_setup.py-expected.json index 0f28bd888a..d582141f54 100644 --- a/tests/packagedcode/data/pypi/setup.py/repology_py_libversion_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/repology_py_libversion_setup.py-expected.json @@ -50,7 +50,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -72,7 +72,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/saneyaml_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/saneyaml_setup.py-expected.json index b15afcbc25..0c77a8dfa8 100644 --- a/tests/packagedcode/data/pypi/setup.py/saneyaml_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/saneyaml_setup.py-expected.json @@ -55,7 +55,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -77,7 +77,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/setuppycheck_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/setuppycheck_setup.py-expected.json index 3d6c96f608..3151589e66 100644 --- a/tests/packagedcode/data/pypi/setup.py/setuppycheck_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/setuppycheck_setup.py-expected.json @@ -44,7 +44,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/simple-setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/simple-setup.py-expected.json index 8fff0d9c1c..a038ca40bd 100644 --- a/tests/packagedcode/data/pypi/setup.py/simple-setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/simple-setup.py-expected.json @@ -51,7 +51,7 @@ "matches": [ { "license_expression": "apache-2.0 AND scancode-acknowledgment", - "spdx_license_expression": "Apache-2.0 AND LicenseRef-scancode-scancode-acknowledgment", + "license_expression_spdx": "Apache-2.0 AND LicenseRef-scancode-scancode-acknowledgment", "from_file": null, "start_line": 1, "end_line": 1, @@ -66,7 +66,7 @@ }, { "license_expression": "cc0-1.0", - "spdx_license_expression": "CC0-1.0", + "license_expression_spdx": "CC0-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -88,7 +88,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -110,7 +110,7 @@ "matches": [ { "license_expression": "free-unknown", - "spdx_license_expression": "LicenseRef-scancode-free-unknown", + "license_expression_spdx": "LicenseRef-scancode-free-unknown", "from_file": null, "start_line": 2, "end_line": 2, diff --git a/tests/packagedcode/data/pypi/setup.py/url_py_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/url_py_setup.py-expected.json index d844183057..139ba674e3 100644 --- a/tests/packagedcode/data/pypi/setup.py/url_py_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/url_py_setup.py-expected.json @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -67,7 +67,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/venv_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/venv_setup.py-expected.json index 0dc6425491..a715c6b647 100644 --- a/tests/packagedcode/data/pypi/setup.py/venv_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/venv_setup.py-expected.json @@ -61,7 +61,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -83,7 +83,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/whatsapp-play-setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/whatsapp-play-setup.py-expected.json index 4c4f98981b..0ac586aed7 100644 --- a/tests/packagedcode/data/pypi/setup.py/whatsapp-play-setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/whatsapp-play-setup.py-expected.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -82,7 +82,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/setup.py/xmltodict_setup.py-expected.json b/tests/packagedcode/data/pypi/setup.py/xmltodict_setup.py-expected.json index 4e3ff95de2..43c61afd8f 100644 --- a/tests/packagedcode/data/pypi/setup.py/xmltodict_setup.py-expected.json +++ b/tests/packagedcode/data/pypi/setup.py/xmltodict_setup.py-expected.json @@ -56,7 +56,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json b/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json index fb3e3f43cc..3ed210de84 100644 --- a/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json +++ b/tests/packagedcode/data/pypi/site-packages/site-packages-expected.json @@ -44,7 +44,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "codebase/PKG-INFO", "start_line": 1, "end_line": 1, @@ -135,7 +135,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "codebase/lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -157,7 +157,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "codebase/lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -285,7 +285,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "codebase/PKG-INFO", "start_line": 1, "end_line": 1, @@ -435,7 +435,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "codebase/lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -457,7 +457,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "codebase/lib/python3.9/site-packages/click-8.0.4.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -1036,7 +1036,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "codebase/setup.py", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/solo-metadata/expected.json b/tests/packagedcode/data/pypi/solo-metadata/expected.json index 481b0476fe..8ee5f4558a 100644 --- a/tests/packagedcode/data/pypi/solo-metadata/expected.json +++ b/tests/packagedcode/data/pypi/solo-metadata/expected.json @@ -68,7 +68,7 @@ "matches": [ { "license_expression": "apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft", - "spdx_license_expression": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft", + "license_expression_spdx": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft", "from_file": "PKG-INFO", "start_line": 1, "end_line": 1, @@ -181,7 +181,7 @@ "matches": [ { "license_expression": "apache-2.0 AND cc-by-4.0 AND other-permissive AND other-copyleft", - "spdx_license_expression": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft", + "license_expression_spdx": "Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft", "from_file": "PKG-INFO", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/solo-setup/expected.json b/tests/packagedcode/data/pypi/solo-setup/expected.json index 3e0c794bd3..a397cd70f0 100644 --- a/tests/packagedcode/data/pypi/solo-setup/expected.json +++ b/tests/packagedcode/data/pypi/solo-setup/expected.json @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "setup.py", "start_line": 1, "end_line": 1, @@ -76,7 +76,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "setup.py", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-expected.json b/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-expected.json index 58bbd28098..262e4c5370 100644 --- a/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-expected.json +++ b/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-expected.json @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -76,7 +76,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -214,7 +214,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -236,7 +236,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -585,7 +585,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/pyproject.toml", "start_line": 1, "end_line": 1, @@ -607,7 +607,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/pyproject.toml", "start_line": 1, "end_line": 1, @@ -631,12 +631,12 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": { "Documentation": "https://pip.pypa.io", "Changelog": "https://pip.pypa.io/en/stable/news/" }, - "is_private": false, - "is_virtual": false, "dependencies": [], "repository_homepage_url": "https://pypi.org/project/pip", "repository_download_url": null, @@ -762,7 +762,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/setup.py", "start_line": 1, "end_line": 1, @@ -784,7 +784,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/setup.py", "start_line": 1, "end_line": 1, @@ -907,7 +907,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "start_line": 1, "end_line": 1, @@ -929,7 +929,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-setup-expected.json b/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-setup-expected.json index 2996ba1782..09b19fdb9c 100644 --- a/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-setup-expected.json +++ b/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-setup-expected.json @@ -60,7 +60,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "setup.py", "start_line": 1, "end_line": 1, @@ -82,7 +82,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "setup.py", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-with-license-expected.json b/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-with-license-expected.json index d316e1a7f7..29c66bc332 100644 --- a/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-with-license-expected.json +++ b/tests/packagedcode/data/pypi/source-package/pip-22.0.4-pypi-package-with-license-expected.json @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -76,7 +76,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -362,7 +362,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -468,7 +468,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -490,7 +490,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -540,7 +540,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 8, "end_line": 8, @@ -561,7 +561,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 15, "end_line": 15, @@ -582,7 +582,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 27, "end_line": 27, @@ -596,7 +596,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -940,7 +940,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/pyproject.toml", "start_line": 1, "end_line": 1, @@ -962,7 +962,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/pyproject.toml", "start_line": 1, "end_line": 1, @@ -986,12 +986,12 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": { "Documentation": "https://pip.pypa.io", "Changelog": "https://pip.pypa.io/en/stable/news/" }, - "is_private": false, - "is_virtual": false, "dependencies": [], "repository_homepage_url": "https://pypi.org/project/pip", "repository_download_url": null, @@ -1012,7 +1012,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/pyproject.toml", "start_line": 11, "end_line": 11, @@ -1069,7 +1069,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "pip-22.0.4/setup.cfg", "start_line": 87, "end_line": 87, @@ -1083,7 +1083,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -1097,7 +1097,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -1146,7 +1146,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "pip-22.0.4/setup.cfg", "start_line": 87, "end_line": 87, @@ -1160,7 +1160,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -1174,7 +1174,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -1255,7 +1255,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/setup.py", "start_line": 1, "end_line": 1, @@ -1277,7 +1277,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/setup.py", "start_line": 1, "end_line": 1, @@ -1328,7 +1328,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/setup.py", "start_line": 31, "end_line": 31, @@ -1342,7 +1342,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/setup.py", "start_line": 35, "end_line": 35, @@ -1456,7 +1456,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "start_line": 1, "end_line": 1, @@ -1478,7 +1478,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "start_line": 1, "end_line": 1, @@ -1682,7 +1682,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "start_line": 8, "end_line": 8, @@ -1703,7 +1703,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "start_line": 15, "end_line": 15, @@ -1724,7 +1724,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "pip-22.0.4/src/pip.egg-info/PKG-INFO", "start_line": 27, "end_line": 27, @@ -1738,7 +1738,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, diff --git a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.0/PyJPString-0.0.3-expected.json b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.0/PyJPString-0.0.3-expected.json index 38abe5f503..9f268e1c28 100644 --- a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.0/PyJPString-0.0.3-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.0/PyJPString-0.0.3-expected.json @@ -43,7 +43,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.0/PyJPString-0.0.3-subdir-expected.json b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.0/PyJPString-0.0.3-subdir-expected.json index 9133b78fbc..a2623c3396 100644 --- a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.0/PyJPString-0.0.3-subdir-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.0/PyJPString-0.0.3-subdir-expected.json @@ -43,7 +43,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.1/python-mimeparse-1.6.0-expected.json b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.1/python-mimeparse-1.6.0-expected.json index 9fb7971017..e4d8fe2859 100644 --- a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.1/python-mimeparse-1.6.0-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.1/python-mimeparse-1.6.0-expected.json @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.1/pyup-django-0.4.0-expected.json b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.1/pyup-django-0.4.0-expected.json index 310155e68a..9b17e1d794 100644 --- a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.1/pyup-django-0.4.0-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.1/pyup-django-0.4.0-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -74,7 +74,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.2/anonapi-0.0.19-expected.json b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.2/anonapi-0.0.19-expected.json index 17116d9038..752328c068 100644 --- a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.2/anonapi-0.0.19-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-1.2/anonapi-0.0.19-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -69,7 +69,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-2.1/commoncode-21.5.12-expected.json b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-2.1/commoncode-21.5.12-expected.json index f6c1e895ec..daf373db09 100644 --- a/tests/packagedcode/data/pypi/unpacked_sdist/metadata-2.1/commoncode-21.5.12-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_sdist/metadata-2.1/commoncode-21.5.12-expected.json @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_sdist/prefer-egg-info-pkg-info/celery-expected.json b/tests/packagedcode/data/pypi/unpacked_sdist/prefer-egg-info-pkg-info/celery-expected.json index 860caab9a3..0962c9ccc0 100644 --- a/tests/packagedcode/data/pypi/unpacked_sdist/prefer-egg-info-pkg-info/celery-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_sdist/prefer-egg-info-pkg-info/celery-expected.json @@ -57,7 +57,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "celery/celery.egg-info/PKG-INFO", "start_line": 1, "end_line": 1, @@ -79,7 +79,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "celery/celery.egg-info/PKG-INFO", "start_line": 1, "end_line": 1, @@ -1285,7 +1285,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "celery/PKG-INFO", "start_line": 1, "end_line": 1, @@ -1307,7 +1307,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "celery/PKG-INFO", "start_line": 1, "end_line": 1, @@ -1419,7 +1419,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "celery/celery.egg-info/PKG-INFO", "start_line": 1, "end_line": 1, @@ -1441,7 +1441,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "celery/celery.egg-info/PKG-INFO", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_wheel/daglib_wheel_extracted-expected.json b/tests/packagedcode/data/pypi/unpacked_wheel/daglib_wheel_extracted-expected.json index bcdfe3c565..cb0ad38bcc 100644 --- a/tests/packagedcode/data/pypi/unpacked_wheel/daglib_wheel_extracted-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_wheel/daglib_wheel_extracted-expected.json @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -67,7 +67,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -250,7 +250,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA", "start_line": 1, "end_line": 1, @@ -272,7 +272,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "daglib_wheel_extracted/daglib-0.6.0.dist-info/METADATA", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/Jinja2-2.10.dist-info-expected.json b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/Jinja2-2.10.dist-info-expected.json index fdd0294a90..2d83f3cfbf 100644 --- a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/Jinja2-2.10.dist-info-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/Jinja2-2.10.dist-info-expected.json @@ -57,7 +57,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, @@ -79,7 +79,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/python_mimeparse-1.6.0.dist-info-expected.json b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/python_mimeparse-1.6.0.dist-info-expected.json index 47d0339d66..564165b411 100644 --- a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/python_mimeparse-1.6.0.dist-info-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/python_mimeparse-1.6.0.dist-info-expected.json @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/toml-0.10.1.dist-info-expected.json b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/toml-0.10.1.dist-info-expected.json index 458ef1aa18..ff6dd8a69e 100644 --- a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/toml-0.10.1.dist-info-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/toml-0.10.1.dist-info-expected.json @@ -57,7 +57,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -79,7 +79,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/urllib3-1.26.4.dist-info-expected.json b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/urllib3-1.26.4.dist-info-expected.json index e49e165484..b6fdf9dc09 100644 --- a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/urllib3-1.26.4.dist-info-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.0/urllib3-1.26.4.dist-info-expected.json @@ -58,7 +58,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -80,7 +80,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/haruka_bot-1.2.3.dist-info-expected.json b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/haruka_bot-1.2.3.dist-info-expected.json index 48d309e9c8..84fa659f9e 100644 --- a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/haruka_bot-1.2.3.dist-info-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/haruka_bot-1.2.3.dist-info-expected.json @@ -49,7 +49,7 @@ "matches": [ { "license_expression": "agpl-3.0-plus", - "spdx_license_expression": "AGPL-3.0-or-later", + "license_expression_spdx": "AGPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -71,7 +71,7 @@ "matches": [ { "license_expression": "agpl-3.0-plus", - "spdx_license_expression": "AGPL-3.0-or-later", + "license_expression_spdx": "AGPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/pip-20.2.2.dist-info-expected.json b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/pip-20.2.2.dist-info-expected.json index 5f3527cd4c..0e8a3b96e4 100644 --- a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/pip-20.2.2.dist-info-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/pip-20.2.2.dist-info-expected.json @@ -55,7 +55,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -77,7 +77,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/plugincode-21.1.21.dist-info-expected.json b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/plugincode-21.1.21.dist-info-expected.json index 2de2b13e0f..3898023e4a 100644 --- a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/plugincode-21.1.21.dist-info-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/plugincode-21.1.21.dist-info-expected.json @@ -52,7 +52,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/with_sources/anonapi-0.0.19.dist-info-expected.json b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/with_sources/anonapi-0.0.19.dist-info-expected.json index f5c09213ed..db651db4da 100644 --- a/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/with_sources/anonapi-0.0.19.dist-info-expected.json +++ b/tests/packagedcode/data/pypi/unpacked_wheel/metadata-2.1/with_sources/anonapi-0.0.19.dist-info-expected.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -69,7 +69,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/android/basic/README.android.expected b/tests/packagedcode/data/readme/android/basic/README.android.expected index 83236907b1..44550e4c2e 100644 --- a/tests/packagedcode/data/readme/android/basic/README.android.expected +++ b/tests/packagedcode/data/readme/android/basic/README.android.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected b/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected index 20dd92be7b..9fc8b9c080 100644 --- a/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected +++ b/tests/packagedcode/data/readme/chromium/basic/README.chromium.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected b/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected index 3586fdc579..377066775b 100644 --- a/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected +++ b/tests/packagedcode/data/readme/facebook/basic/README.facebook.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/facebook/capital-filename/README.FACEBOOK.expected b/tests/packagedcode/data/readme/facebook/capital-filename/README.FACEBOOK.expected index 3586fdc579..377066775b 100644 --- a/tests/packagedcode/data/readme/facebook/capital-filename/README.FACEBOOK.expected +++ b/tests/packagedcode/data/readme/facebook/capital-filename/README.FACEBOOK.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/facebook/download-link-as-download_url/README.facebook.expected b/tests/packagedcode/data/readme/facebook/download-link-as-download_url/README.facebook.expected index dcea544e64..3c7b15f386 100644 --- a/tests/packagedcode/data/readme/facebook/download-link-as-download_url/README.facebook.expected +++ b/tests/packagedcode/data/readme/facebook/download-link-as-download_url/README.facebook.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/facebook/downloaded-from-as-download_url/README.facebook.expected b/tests/packagedcode/data/readme/facebook/downloaded-from-as-download_url/README.facebook.expected index dcea544e64..3c7b15f386 100644 --- a/tests/packagedcode/data/readme/facebook/downloaded-from-as-download_url/README.facebook.expected +++ b/tests/packagedcode/data/readme/facebook/downloaded-from-as-download_url/README.facebook.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/facebook/project-as-name/README.facebook.expected b/tests/packagedcode/data/readme/facebook/project-as-name/README.facebook.expected index 619a1fb595..3ee7233a33 100644 --- a/tests/packagedcode/data/readme/facebook/project-as-name/README.facebook.expected +++ b/tests/packagedcode/data/readme/facebook/project-as-name/README.facebook.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/facebook/repo-as-homepage_url/README.facebook.expected b/tests/packagedcode/data/readme/facebook/repo-as-homepage_url/README.facebook.expected index 619a1fb595..3ee7233a33 100644 --- a/tests/packagedcode/data/readme/facebook/repo-as-homepage_url/README.facebook.expected +++ b/tests/packagedcode/data/readme/facebook/repo-as-homepage_url/README.facebook.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/facebook/source-as-homepage_url/README.facebook.expected b/tests/packagedcode/data/readme/facebook/source-as-homepage_url/README.facebook.expected index 619a1fb595..3ee7233a33 100644 --- a/tests/packagedcode/data/readme/facebook/source-as-homepage_url/README.facebook.expected +++ b/tests/packagedcode/data/readme/facebook/source-as-homepage_url/README.facebook.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/facebook/use-parent-dir-name-as-package-name/setuptools/README.facebook.expected b/tests/packagedcode/data/readme/facebook/use-parent-dir-name-as-package-name/setuptools/README.facebook.expected index 3586fdc579..377066775b 100644 --- a/tests/packagedcode/data/readme/facebook/use-parent-dir-name-as-package-name/setuptools/README.facebook.expected +++ b/tests/packagedcode/data/readme/facebook/use-parent-dir-name-as-package-name/setuptools/README.facebook.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/facebook/website-as-homepage_url/README.facebook.expected b/tests/packagedcode/data/readme/facebook/website-as-homepage_url/README.facebook.expected index 619a1fb595..3ee7233a33 100644 --- a/tests/packagedcode/data/readme/facebook/website-as-homepage_url/README.facebook.expected +++ b/tests/packagedcode/data/readme/facebook/website-as-homepage_url/README.facebook.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/google/basic/README.google.expected b/tests/packagedcode/data/readme/google/basic/README.google.expected index 41940121c8..cc5f280abb 100644 --- a/tests/packagedcode/data/readme/google/basic/README.google.expected +++ b/tests/packagedcode/data/readme/google/basic/README.google.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected b/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected index e5995cacc1..1ea4972015 100644 --- a/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected +++ b/tests/packagedcode/data/readme/thirdparty/basic/README.thirdparty.expected @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rpm/header/libproxy-bin-0.3.0-4.el6_3.x86_64.rpm-package-expected.json b/tests/packagedcode/data/rpm/header/libproxy-bin-0.3.0-4.el6_3.x86_64.rpm-package-expected.json index 96bfd0f3af..4b38c57bc7 100644 --- a/tests/packagedcode/data/rpm/header/libproxy-bin-0.3.0-4.el6_3.x86_64.rpm-package-expected.json +++ b/tests/packagedcode/data/rpm/header/libproxy-bin-0.3.0-4.el6_3.x86_64.rpm-package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rpm_installed/distro-xmlish/centos-8-rpms.xmlish-expected.json b/tests/packagedcode/data/rpm_installed/distro-xmlish/centos-8-rpms.xmlish-expected.json index 43ba89ac74..6b86b5a242 100644 --- a/tests/packagedcode/data/rpm_installed/distro-xmlish/centos-8-rpms.xmlish-expected.json +++ b/tests/packagedcode/data/rpm_installed/distro-xmlish/centos-8-rpms.xmlish-expected.json @@ -34,7 +34,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, @@ -140,7 +140,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": null, "start_line": 1, "end_line": 1, @@ -237,7 +237,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rpm_installed/distro-xmlish/fc33-rpms.xmlish-expected.json b/tests/packagedcode/data/rpm_installed/distro-xmlish/fc33-rpms.xmlish-expected.json index c7625e4ccc..44a0733c63 100644 --- a/tests/packagedcode/data/rpm_installed/distro-xmlish/fc33-rpms.xmlish-expected.json +++ b/tests/packagedcode/data/rpm_installed/distro-xmlish/fc33-rpms.xmlish-expected.json @@ -34,7 +34,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -49,7 +49,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -64,7 +64,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -79,7 +79,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -248,7 +248,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rpm_installed/distro-xmlish/openmandriva-rpms.xmlish-expected.json b/tests/packagedcode/data/rpm_installed/distro-xmlish/openmandriva-rpms.xmlish-expected.json index b010049ea5..1f0d0e301f 100644 --- a/tests/packagedcode/data/rpm_installed/distro-xmlish/openmandriva-rpms.xmlish-expected.json +++ b/tests/packagedcode/data/rpm_installed/distro-xmlish/openmandriva-rpms.xmlish-expected.json @@ -34,7 +34,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, @@ -968,7 +968,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rpm_installed/distro-xmlish/opensuse-rpms.xmlish-expected.json b/tests/packagedcode/data/rpm_installed/distro-xmlish/opensuse-rpms.xmlish-expected.json index 8f15521e65..39f650461e 100644 --- a/tests/packagedcode/data/rpm_installed/distro-xmlish/opensuse-rpms.xmlish-expected.json +++ b/tests/packagedcode/data/rpm_installed/distro-xmlish/opensuse-rpms.xmlish-expected.json @@ -34,7 +34,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": null, "start_line": 1, "end_line": 1, @@ -122,7 +122,7 @@ "matches": [ { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rpm_installed/distro-xmlish/rhel-rpms.xmlish-expected.json b/tests/packagedcode/data/rpm_installed/distro-xmlish/rhel-rpms.xmlish-expected.json index e796775513..a35c8605ea 100644 --- a/tests/packagedcode/data/rpm_installed/distro-xmlish/rhel-rpms.xmlish-expected.json +++ b/tests/packagedcode/data/rpm_installed/distro-xmlish/rhel-rpms.xmlish-expected.json @@ -34,7 +34,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, @@ -437,7 +437,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, @@ -506,7 +506,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rpm_installed/end-to-end/bdb-fedora-rootfs.tar.xz-expected.json b/tests/packagedcode/data/rpm_installed/end-to-end/bdb-fedora-rootfs.tar.xz-expected.json index 5e9fd90ebd..b91e559caf 100644 --- a/tests/packagedcode/data/rpm_installed/end-to-end/bdb-fedora-rootfs.tar.xz-expected.json +++ b/tests/packagedcode/data/rpm_installed/end-to-end/bdb-fedora-rootfs.tar.xz-expected.json @@ -35,7 +35,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -309,7 +309,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -421,7 +421,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -494,7 +494,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -17220,7 +17220,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -17235,7 +17235,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -17250,7 +17250,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -17323,7 +17323,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -17338,7 +17338,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -17353,7 +17353,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -17843,7 +17843,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -18864,7 +18864,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -18985,7 +18985,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -19097,7 +19097,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -19170,7 +19170,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -19471,7 +19471,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -19556,7 +19556,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -19695,7 +19695,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -19780,7 +19780,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -20171,7 +20171,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -20186,7 +20186,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -20298,7 +20298,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -21166,7 +21166,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -21181,7 +21181,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -21302,7 +21302,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -21317,7 +21317,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -21465,7 +21465,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -21559,7 +21559,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -22067,7 +22067,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -22170,7 +22170,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -22255,7 +22255,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -22412,7 +22412,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -22427,7 +22427,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -22575,7 +22575,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -22669,7 +22669,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -22772,7 +22772,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -22884,7 +22884,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -22957,7 +22957,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -23069,7 +23069,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -23172,7 +23172,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -23187,7 +23187,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -23272,7 +23272,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -23357,7 +23357,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -23865,7 +23865,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -24436,7 +24436,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -24451,7 +24451,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -24599,7 +24599,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -24614,7 +24614,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -24879,7 +24879,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -24894,7 +24894,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -24909,7 +24909,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -25057,7 +25057,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -25187,7 +25187,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -25326,7 +25326,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -25627,7 +25627,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -25712,7 +25712,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -25833,7 +25833,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -28789,7 +28789,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -28910,7 +28910,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -28925,7 +28925,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -29019,7 +29019,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -29149,7 +29149,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -29369,7 +29369,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -29535,7 +29535,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -29620,7 +29620,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -29705,7 +29705,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -30564,7 +30564,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -30579,7 +30579,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -30594,7 +30594,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -30609,7 +30609,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -30694,7 +30694,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -30851,7 +30851,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -30963,7 +30963,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -31127,7 +31127,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -31200,7 +31200,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -31215,7 +31215,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -31230,7 +31230,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -31245,7 +31245,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -31339,7 +31339,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -31514,7 +31514,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -185364,7 +185364,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -185437,7 +185437,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -185531,7 +185531,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -185546,7 +185546,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -185561,7 +185561,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -185682,7 +185682,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -185938,7 +185938,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186011,7 +186011,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186096,7 +186096,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186217,7 +186217,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186290,7 +186290,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186384,7 +186384,7 @@ "matches": [ { "license_expression": "lgpl-2.0", - "spdx_license_expression": "LGPL-2.0-only", + "license_expression_spdx": "LGPL-2.0-only", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186487,7 +186487,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186502,7 +186502,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186517,7 +186517,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186629,7 +186629,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186714,7 +186714,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186817,7 +186817,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -186983,7 +186983,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -187563,7 +187563,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -187578,7 +187578,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -187593,7 +187593,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -187732,7 +187732,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -187817,7 +187817,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -187902,7 +187902,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -188068,7 +188068,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -188153,7 +188153,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -189255,7 +189255,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -189376,7 +189376,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -189533,7 +189533,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -189654,7 +189654,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -189757,7 +189757,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -189772,7 +189772,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -189902,7 +189902,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -190050,7 +190050,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -190171,7 +190171,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -190265,7 +190265,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -191025,7 +191025,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -191272,7 +191272,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -193967,7 +193967,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -194052,7 +194052,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -194067,7 +194067,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -194215,7 +194215,7 @@ "matches": [ { "license_expression": "lgpl-2.0", - "spdx_license_expression": "LGPL-2.0-only", + "license_expression_spdx": "LGPL-2.0-only", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -194426,7 +194426,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -194499,7 +194499,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -194572,7 +194572,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -194666,7 +194666,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -194751,7 +194751,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -194836,7 +194836,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -194921,7 +194921,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -195024,7 +195024,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -195154,7 +195154,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -195284,7 +195284,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -195299,7 +195299,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -195314,7 +195314,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -195741,7 +195741,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -196033,7 +196033,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -196118,7 +196118,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -196293,7 +196293,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -196308,7 +196308,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -196429,7 +196429,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -196523,7 +196523,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -197535,7 +197535,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -197629,7 +197629,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -197723,7 +197723,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -197738,7 +197738,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -197753,7 +197753,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -197775,7 +197775,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -222936,7 +222936,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -223303,7 +223303,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -223661,7 +223661,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -223730,7 +223730,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -240468,7 +240468,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -240483,7 +240483,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -240498,7 +240498,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -240567,7 +240567,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -240582,7 +240582,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -240597,7 +240597,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -243547,7 +243547,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -244760,7 +244760,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -244920,7 +244920,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -245053,7 +245053,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -245168,7 +245168,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -245508,7 +245508,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -245614,7 +245614,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -245819,7 +245819,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -245934,7 +245934,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -246355,7 +246355,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -246370,7 +246370,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -246530,7 +246530,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -247527,7 +247527,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -247542,7 +247542,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -247693,7 +247693,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -247708,7 +247708,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -247886,7 +247886,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -247974,7 +247974,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -248503,7 +248503,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -248609,7 +248609,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -248724,7 +248724,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -248920,7 +248920,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -248935,7 +248935,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -249113,7 +249113,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -249219,7 +249219,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -249325,7 +249325,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -249467,7 +249467,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -249582,7 +249582,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -249823,7 +249823,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -249947,7 +249947,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -249962,7 +249962,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -250230,7 +250230,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -250345,7 +250345,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -250937,7 +250937,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -251574,7 +251574,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -251589,7 +251589,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -251767,7 +251767,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -251782,7 +251782,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -252086,7 +252086,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -252101,7 +252101,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -252116,7 +252116,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -252312,7 +252312,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -252490,7 +252490,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -252740,7 +252740,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -253107,7 +253107,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -253222,7 +253222,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -253391,7 +253391,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -256593,7 +256593,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -256735,7 +256735,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -256750,7 +256750,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -256865,7 +256865,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -257007,7 +257007,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -257446,7 +257446,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -257705,7 +257705,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -257811,7 +257811,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -257890,7 +257890,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -260210,7 +260210,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -260225,7 +260225,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -260240,7 +260240,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -260255,7 +260255,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -260370,7 +260370,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -260557,7 +260557,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -260699,7 +260699,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -260974,7 +260974,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -261043,7 +261043,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -261058,7 +261058,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -261073,7 +261073,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -261088,7 +261088,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -261230,7 +261230,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -261480,7 +261480,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -416818,7 +416818,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -416924,7 +416924,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -418470,7 +418470,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -418485,7 +418485,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -418500,7 +418500,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -418939,7 +418939,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -419189,7 +419189,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -419286,7 +419286,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -419410,7 +419410,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -419570,7 +419570,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -419667,7 +419667,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -419764,7 +419764,7 @@ "matches": [ { "license_expression": "lgpl-2.0", - "spdx_license_expression": "LGPL-2.0-only", + "license_expression_spdx": "LGPL-2.0-only", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -419897,7 +419897,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -419912,7 +419912,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -419927,7 +419927,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -420033,7 +420033,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -420139,7 +420139,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -420263,7 +420263,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -420513,7 +420513,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -421141,7 +421141,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -421156,7 +421156,7 @@ }, { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -421171,7 +421171,7 @@ }, { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -421367,7 +421367,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -421464,7 +421464,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -422506,7 +422506,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -423044,7 +423044,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -423123,7 +423123,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -424417,7 +424417,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -424577,7 +424577,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -424764,7 +424764,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -424906,7 +424906,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -425012,7 +425012,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -425027,7 +425027,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -425187,7 +425187,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -425644,7 +425644,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -425786,7 +425786,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -425937,7 +425937,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -426754,7 +426754,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -427157,7 +427157,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -430656,7 +430656,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -430762,7 +430762,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -430777,7 +430777,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -431009,7 +431009,7 @@ "matches": [ { "license_expression": "lgpl-2.0", - "spdx_license_expression": "LGPL-2.0-only", + "license_expression_spdx": "LGPL-2.0-only", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -431349,7 +431349,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -431518,7 +431518,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -431615,7 +431615,7 @@ "matches": [ { "license_expression": "mpl-2.0", - "spdx_license_expression": "MPL-2.0", + "license_expression_spdx": "MPL-2.0", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -431721,7 +431721,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -431836,7 +431836,7 @@ "matches": [ { "license_expression": "lgpl-3.0-plus", - "spdx_license_expression": "LGPL-3.0-or-later", + "license_expression_spdx": "LGPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -431951,7 +431951,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -432102,7 +432102,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -432244,7 +432244,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -432395,7 +432395,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -432546,7 +432546,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -432561,7 +432561,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -432576,7 +432576,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -433429,7 +433429,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -433796,7 +433796,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -433902,7 +433902,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -434098,7 +434098,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -434113,7 +434113,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -434228,7 +434228,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -434352,7 +434352,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -435592,7 +435592,7 @@ "matches": [ { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -435707,7 +435707,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -435822,7 +435822,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -435837,7 +435837,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -435852,7 +435852,7 @@ }, { "license_expression": "lgpl-2.0-plus", - "spdx_license_expression": "LGPL-2.0-or-later", + "license_expression_spdx": "LGPL-2.0-or-later", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, @@ -435874,7 +435874,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "rootfs/var/lib/rpm/Packages", "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rpm_installed/mariner/scan.expected.json b/tests/packagedcode/data/rpm_installed/mariner/scan.expected.json index 260f6c451e..a7c4babb93 100644 --- a/tests/packagedcode/data/rpm_installed/mariner/scan.expected.json +++ b/tests/packagedcode/data/rpm_installed/mariner/scan.expected.json @@ -163,7 +163,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "scan/usr/share/licenses/glibc/COPYING", "start_line": 1, "end_line": 2, @@ -187,7 +187,7 @@ "matches": [ { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "scan/usr/share/licenses/glibc/COPYING.LIB", "start_line": 1, "end_line": 2, @@ -215,7 +215,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/usr/share/licenses/glibc/LICENSES", "start_line": 1, "end_line": 1, @@ -239,7 +239,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "scan/usr/share/licenses/glibc/LICENSES", "start_line": 6, "end_line": 6, @@ -387,7 +387,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "scan/usr/share/licenses/tzdata/LICENSE", "start_line": 2, "end_line": 2, @@ -403,7 +403,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "scan/usr/share/licenses/tzdata/LICENSE", "start_line": 5, "end_line": 5, @@ -550,7 +550,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "scan/usr/share/licenses/openssl/LICENSE", "start_line": 1, "end_line": 2, @@ -697,7 +697,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/usr/share/licenses/iana-etc/LICENSE", "start_line": 1, "end_line": 1, @@ -996,7 +996,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "scan/usr/share/licenses/glibc/COPYING", "start_line": 1, "end_line": 2, @@ -1075,7 +1075,7 @@ "matches": [ { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "scan/usr/share/licenses/glibc/COPYING.LIB", "start_line": 1, "end_line": 2, @@ -1154,7 +1154,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/usr/share/licenses/glibc/LICENSES", "start_line": 1, "end_line": 1, @@ -1178,7 +1178,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "scan/usr/share/licenses/glibc/LICENSES", "start_line": 6, "end_line": 6, @@ -1264,7 +1264,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/usr/share/licenses/iana-etc/LICENSE", "start_line": 1, "end_line": 1, @@ -1350,7 +1350,7 @@ "matches": [ { "license_expression": "openssl-ssleay", - "spdx_license_expression": "OpenSSL", + "license_expression_spdx": "OpenSSL", "from_file": "scan/usr/share/licenses/openssl/LICENSE", "start_line": 1, "end_line": 2, @@ -1436,7 +1436,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "scan/usr/share/licenses/tzdata/LICENSE", "start_line": 2, "end_line": 2, @@ -1452,7 +1452,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "scan/usr/share/licenses/tzdata/LICENSE", "start_line": 5, "end_line": 5, diff --git a/tests/packagedcode/data/rpm_installed/xmlish/centos-5-rpms.xmlish-expected.json b/tests/packagedcode/data/rpm_installed/xmlish/centos-5-rpms.xmlish-expected.json index 9e619f3284..99a644cf0d 100644 --- a/tests/packagedcode/data/rpm_installed/xmlish/centos-5-rpms.xmlish-expected.json +++ b/tests/packagedcode/data/rpm_installed/xmlish/centos-5-rpms.xmlish-expected.json @@ -34,7 +34,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, @@ -356,7 +356,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rpm_installed/xmlish/centos-5-rpms.xmlish-with-license-expected.json b/tests/packagedcode/data/rpm_installed/xmlish/centos-5-rpms.xmlish-with-license-expected.json index 9e619f3284..99a644cf0d 100644 --- a/tests/packagedcode/data/rpm_installed/xmlish/centos-5-rpms.xmlish-with-license-expected.json +++ b/tests/packagedcode/data/rpm_installed/xmlish/centos-5-rpms.xmlish-with-license-expected.json @@ -34,7 +34,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, @@ -356,7 +356,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rubygems/gem/action_tracker-1.0.2.gem.json b/tests/packagedcode/data/rubygems/gem/action_tracker-1.0.2.gem.json index 00d9f616e6..21b0491a8a 100644 --- a/tests/packagedcode/data/rubygems/gem/action_tracker-1.0.2.gem.json +++ b/tests/packagedcode/data/rubygems/gem/action_tracker-1.0.2.gem.json @@ -47,7 +47,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rubygems/gem/m2r-2.1.0.gem.json b/tests/packagedcode/data/rubygems/gem/m2r-2.1.0.gem.json index 1091ab26d4..827f429913 100644 --- a/tests/packagedcode/data/rubygems/gem/m2r-2.1.0.gem.json +++ b/tests/packagedcode/data/rubygems/gem/m2r-2.1.0.gem.json @@ -61,7 +61,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rubygems/gem/new/dependabot-omnibus-0.87.15.gem.json b/tests/packagedcode/data/rubygems/gem/new/dependabot-omnibus-0.87.15.gem.json index 1712e074ba..38f6b0a0b0 100644 --- a/tests/packagedcode/data/rubygems/gem/new/dependabot-omnibus-0.87.15.gem.json +++ b/tests/packagedcode/data/rubygems/gem/new/dependabot-omnibus-0.87.15.gem.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "proprietary-license", - "spdx_license_expression": "LicenseRef-scancode-proprietary-license", + "license_expression_spdx": "LicenseRef-scancode-proprietary-license", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rubygems/gem/new/hiredis-0.6.3-java.gem.json b/tests/packagedcode/data/rubygems/gem/new/hiredis-0.6.3-java.gem.json index 12849fb117..7a4c9d7ee7 100644 --- a/tests/packagedcode/data/rubygems/gem/new/hiredis-0.6.3-java.gem.json +++ b/tests/packagedcode/data/rubygems/gem/new/hiredis-0.6.3-java.gem.json @@ -42,7 +42,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rubygems/gem/new/int_time-0.0.2.gem.json b/tests/packagedcode/data/rubygems/gem/new/int_time-0.0.2.gem.json index fa6d3f93d1..e95da69c62 100644 --- a/tests/packagedcode/data/rubygems/gem/new/int_time-0.0.2.gem.json +++ b/tests/packagedcode/data/rubygems/gem/new/int_time-0.0.2.gem.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rubygems/gem/new/jaro_winkler-1.5.1-java.gem.json b/tests/packagedcode/data/rubygems/gem/new/jaro_winkler-1.5.1-java.gem.json index f779a55444..e7990de011 100644 --- a/tests/packagedcode/data/rubygems/gem/new/jaro_winkler-1.5.1-java.gem.json +++ b/tests/packagedcode/data/rubygems/gem/new/jaro_winkler-1.5.1-java.gem.json @@ -42,7 +42,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/rubygems/gem/new/rubocop-0.62.0.gem.json b/tests/packagedcode/data/rubygems/gem/new/rubocop-0.62.0.gem.json index cb94f3a9e5..78b74e86f4 100644 --- a/tests/packagedcode/data/rubygems/gem/new/rubocop-0.62.0.gem.json +++ b/tests/packagedcode/data/rubygems/gem/new/rubocop-0.62.0.gem.json @@ -54,7 +54,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/Microsoft.Practices.EnterpriseLibrary.Caching.dll.package-expected.json b/tests/packagedcode/data/win_pe/Microsoft.Practices.EnterpriseLibrary.Caching.dll.package-expected.json index 34f3e554f4..adbc1a7b5d 100644 --- a/tests/packagedcode/data/win_pe/Microsoft.Practices.EnterpriseLibrary.Caching.dll.package-expected.json +++ b/tests/packagedcode/data/win_pe/Microsoft.Practices.EnterpriseLibrary.Caching.dll.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/Moq.Silverlight.dll.package-expected.json b/tests/packagedcode/data/win_pe/Moq.Silverlight.dll.package-expected.json index 5491357a77..53e1e61770 100644 --- a/tests/packagedcode/data/win_pe/Moq.Silverlight.dll.package-expected.json +++ b/tests/packagedcode/data/win_pe/Moq.Silverlight.dll.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/Windows.AI.winmd.package-expected.json b/tests/packagedcode/data/win_pe/Windows.AI.winmd.package-expected.json index 9b5b9b7ecc..435abe665f 100644 --- a/tests/packagedcode/data/win_pe/Windows.AI.winmd.package-expected.json +++ b/tests/packagedcode/data/win_pe/Windows.AI.winmd.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/_ctypes_test.pyd.package-expected.json b/tests/packagedcode/data/win_pe/_ctypes_test.pyd.package-expected.json index 3c949463cb..e859d3f271 100644 --- a/tests/packagedcode/data/win_pe/_ctypes_test.pyd.package-expected.json +++ b/tests/packagedcode/data/win_pe/_ctypes_test.pyd.package-expected.json @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/chcp.com.package-expected.json b/tests/packagedcode/data/win_pe/chcp.com.package-expected.json index a51ece7a28..79df3de0d3 100644 --- a/tests/packagedcode/data/win_pe/chcp.com.package-expected.json +++ b/tests/packagedcode/data/win_pe/chcp.com.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/clfs.sys.mui.package-expected.json b/tests/packagedcode/data/win_pe/clfs.sys.mui.package-expected.json index 366b32b5ea..5fad3ef1f6 100644 --- a/tests/packagedcode/data/win_pe/clfs.sys.mui.package-expected.json +++ b/tests/packagedcode/data/win_pe/clfs.sys.mui.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/crypt32.dll.mun.package-expected.json b/tests/packagedcode/data/win_pe/crypt32.dll.mun.package-expected.json index 923b37411f..640cd82102 100644 --- a/tests/packagedcode/data/win_pe/crypt32.dll.mun.package-expected.json +++ b/tests/packagedcode/data/win_pe/crypt32.dll.mun.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/euc-jp.so.package-expected.json b/tests/packagedcode/data/win_pe/euc-jp.so.package-expected.json index 3c949463cb..e859d3f271 100644 --- a/tests/packagedcode/data/win_pe/euc-jp.so.package-expected.json +++ b/tests/packagedcode/data/win_pe/euc-jp.so.package-expected.json @@ -32,7 +32,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/file.exe.package-expected.json b/tests/packagedcode/data/win_pe/file.exe.package-expected.json index f1e7e5ff46..882be759ef 100644 --- a/tests/packagedcode/data/win_pe/file.exe.package-expected.json +++ b/tests/packagedcode/data/win_pe/file.exe.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "bsd-simplified-darwin", - "spdx_license_expression": "BSD-2-Clause-Darwin", + "license_expression_spdx": "BSD-2-Clause-Darwin", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/libiconv2.dll.package-expected.json b/tests/packagedcode/data/win_pe/libiconv2.dll.package-expected.json index 3bb1c7cecc..4cb1441929 100644 --- a/tests/packagedcode/data/win_pe/libiconv2.dll.package-expected.json +++ b/tests/packagedcode/data/win_pe/libiconv2.dll.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/libintl3.dll.package-expected.json b/tests/packagedcode/data/win_pe/libintl3.dll.package-expected.json index 629cbdbc6b..54e0b220c5 100644 --- a/tests/packagedcode/data/win_pe/libintl3.dll.package-expected.json +++ b/tests/packagedcode/data/win_pe/libintl3.dll.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/stdole2.tlb.package-expected.json b/tests/packagedcode/data/win_pe/stdole2.tlb.package-expected.json index 0d5904fd43..58df2808e7 100644 --- a/tests/packagedcode/data/win_pe/stdole2.tlb.package-expected.json +++ b/tests/packagedcode/data/win_pe/stdole2.tlb.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/tbs.sys.package-expected.json b/tests/packagedcode/data/win_pe/tbs.sys.package-expected.json index 71664d20d0..2ecf708ce1 100644 --- a/tests/packagedcode/data/win_pe/tbs.sys.package-expected.json +++ b/tests/packagedcode/data/win_pe/tbs.sys.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/tre4.dll.package-expected.json b/tests/packagedcode/data/win_pe/tre4.dll.package-expected.json index 9d3f48c0fc..8ec1bd2068 100644 --- a/tests/packagedcode/data/win_pe/tre4.dll.package-expected.json +++ b/tests/packagedcode/data/win_pe/tre4.dll.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/packagedcode/data/win_pe/zlib1.dll.package-expected.json b/tests/packagedcode/data/win_pe/zlib1.dll.package-expected.json index 3c3c879100..9a507aa3aa 100644 --- a/tests/packagedcode/data/win_pe/zlib1.dll.package-expected.json +++ b/tests/packagedcode/data/win_pe/zlib1.dll.package-expected.json @@ -40,7 +40,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": null, "start_line": 1, "end_line": 1, @@ -62,7 +62,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": null, "start_line": 1, "end_line": 1, diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json index d554e92793..11ae1b4d07 100644 --- a/tests/scancode/data/composer/composer.expected.json +++ b/tests/scancode/data/composer/composer.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "composer.json", "start_line": 1, "end_line": 1, @@ -248,7 +248,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "composer.json", "start_line": 1, "end_line": 1, diff --git a/tests/scancode/data/info/all.expected.json b/tests/scancode/data/info/all.expected.json index 31ff697c27..e99000af6a 100644 --- a/tests/scancode/data/info/all.expected.json +++ b/tests/scancode/data/info/all.expected.json @@ -339,7 +339,7 @@ "matches": [ { "license_expression": "bsd-original-uc", - "spdx_license_expression": "BSD-4-Clause-UC", + "license_expression_spdx": "BSD-4-Clause-UC", "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s", "start_line": 25, "end_line": 51, @@ -445,7 +445,7 @@ "matches": [ { "license_expression": "gpl-2.0 OR bsd-new", - "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause", + "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause", "from_file": "basic.tgz/basic/main.c", "start_line": 5, "end_line": 12, diff --git a/tests/scancode/data/info/all.rooted.expected.json b/tests/scancode/data/info/all.rooted.expected.json index cb95d6da51..f69f8e9296 100644 --- a/tests/scancode/data/info/all.rooted.expected.json +++ b/tests/scancode/data/info/all.rooted.expected.json @@ -193,7 +193,7 @@ "matches": [ { "license_expression": "bsd-original-uc", - "spdx_license_expression": "BSD-4-Clause-UC", + "license_expression_spdx": "BSD-4-Clause-UC", "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s", "start_line": 25, "end_line": 51, @@ -281,7 +281,7 @@ "matches": [ { "license_expression": "gpl-2.0 OR bsd-new", - "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause", + "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause", "from_file": "basic.tgz/basic/main.c", "start_line": 5, "end_line": 12, diff --git a/tests/scancode/data/license_text/test.expected b/tests/scancode/data/license_text/test.expected index f604590b32..9bfeda9137 100644 --- a/tests/scancode/data/license_text/test.expected +++ b/tests/scancode/data/license_text/test.expected @@ -39,7 +39,7 @@ "matches": [ { "license_expression": "lgpl-2.1", - "spdx_license_expression": "LGPL-2.1-only", + "license_expression_spdx": "LGPL-2.1-only", "from_file": "test.txt", "start_line": 1, "end_line": 1, diff --git a/tests/scancode/data/plugin_only_findings/basic.expected.json b/tests/scancode/data/plugin_only_findings/basic.expected.json index ccb240aca4..03d5751cb1 100644 --- a/tests/scancode/data/plugin_only_findings/basic.expected.json +++ b/tests/scancode/data/plugin_only_findings/basic.expected.json @@ -78,7 +78,7 @@ "matches": [ { "license_expression": "bsd-original-uc", - "spdx_license_expression": "BSD-4-Clause-UC", + "license_expression_spdx": "BSD-4-Clause-UC", "from_file": "basic.tgz/basic/dir2/subdir/bcopy.s", "start_line": 25, "end_line": 51, @@ -152,7 +152,7 @@ "matches": [ { "license_expression": "gpl-2.0 OR bsd-new", - "spdx_license_expression": "GPL-2.0-only OR BSD-3-Clause", + "license_expression_spdx": "GPL-2.0-only OR BSD-3-Clause", "from_file": "basic.tgz/basic/main.c", "start_line": 5, "end_line": 12, diff --git a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json index ad9fc23d9a..f84a565b80 100644 --- a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json +++ b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "fping-2.4-0.b2.rhfc1.dag.i386.rpm", "start_line": 1, "end_line": 1, @@ -129,7 +129,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "fping-2.4-0.b2.rhfc1.dag.i386.rpm", "start_line": 1, "end_line": 1, diff --git a/tests/summarycode/data/classify/with_package_data.expected.json b/tests/summarycode/data/classify/with_package_data.expected.json index d5f3ed2bc2..57930562d9 100644 --- a/tests/summarycode/data/classify/with_package_data.expected.json +++ b/tests/summarycode/data/classify/with_package_data.expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "start_line": 1, "end_line": 1, @@ -48,7 +48,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "start_line": 2, "end_line": 2, @@ -672,7 +672,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "start_line": 1, "end_line": 1, @@ -687,7 +687,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "start_line": 2, "end_line": 2, diff --git a/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json index 8c8b23b806..472231659b 100644 --- a/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json +++ b/tests/summarycode/data/plugin_consolidate/component-package-build-expected.json @@ -81,7 +81,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package-build/package/package.json", "start_line": 1, "end_line": 1, @@ -483,7 +483,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package-build/component/src1", "start_line": 2, "end_line": 2, @@ -554,7 +554,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package-build/component/src2", "start_line": 2, "end_line": 2, @@ -625,7 +625,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package-build/component/src3", "start_line": 2, "end_line": 2, @@ -696,7 +696,7 @@ "matches": [ { "license_expression": "lgpl-2.0", - "spdx_license_expression": "LGPL-2.0-only", + "license_expression_spdx": "LGPL-2.0-only", "from_file": "component-package-build/component/src4", "start_line": 2, "end_line": 2, @@ -827,7 +827,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package-build/package/package.json", "start_line": 1, "end_line": 1, @@ -874,7 +874,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package-build/package/package.json", "start_line": 5, "end_line": 5, @@ -945,7 +945,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package-build/package/src1", "start_line": 2, "end_line": 2, @@ -1016,7 +1016,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "component-package-build/package/src2", "start_line": 2, "end_line": 2, diff --git a/tests/summarycode/data/plugin_consolidate/component-package-expected.json b/tests/summarycode/data/plugin_consolidate/component-package-expected.json index c291b9a8f8..c193e6d276 100644 --- a/tests/summarycode/data/plugin_consolidate/component-package-expected.json +++ b/tests/summarycode/data/plugin_consolidate/component-package-expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package/package/package.json", "start_line": 1, "end_line": 1, @@ -318,7 +318,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package/component/src1", "start_line": 2, "end_line": 2, @@ -389,7 +389,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package/component/src2", "start_line": 2, "end_line": 2, @@ -460,7 +460,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package/component/src3", "start_line": 2, "end_line": 2, @@ -531,7 +531,7 @@ "matches": [ { "license_expression": "lgpl-2.0", - "spdx_license_expression": "LGPL-2.0-only", + "license_expression_spdx": "LGPL-2.0-only", "from_file": "component-package/component/src4", "start_line": 2, "end_line": 2, @@ -662,7 +662,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package/package/package.json", "start_line": 1, "end_line": 1, @@ -709,7 +709,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package/package/package.json", "start_line": 5, "end_line": 5, @@ -780,7 +780,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "component-package/package/src1", "start_line": 2, "end_line": 2, @@ -851,7 +851,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "component-package/package/src2", "start_line": 2, "end_line": 2, diff --git a/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json b/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json index 1ce37ee564..cbe637c2de 100644 --- a/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json +++ b/tests/summarycode/data/plugin_consolidate/license-holder-rollup-expected.json @@ -264,7 +264,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "license-holder-rollup/clear-majority/dir1/file1", "start_line": 2, "end_line": 2, @@ -278,7 +278,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "license-holder-rollup/clear-majority/dir1/file1", "start_line": 2, "end_line": 2, @@ -421,7 +421,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "license-holder-rollup/no-majority/bar/qux", "start_line": 2, "end_line": 2, @@ -435,7 +435,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "license-holder-rollup/no-majority/bar/qux", "start_line": 2, "end_line": 2, @@ -543,7 +543,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "license-holder-rollup/no-majority/foo/baz", "start_line": 2, "end_line": 2, @@ -557,7 +557,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "license-holder-rollup/no-majority/foo/baz", "start_line": 2, "end_line": 2, diff --git a/tests/summarycode/data/plugin_consolidate/multiple-same-holder-and-license-expected.json b/tests/summarycode/data/plugin_consolidate/multiple-same-holder-and-license-expected.json index 738de8695c..4e0ba59402 100644 --- a/tests/summarycode/data/plugin_consolidate/multiple-same-holder-and-license-expected.json +++ b/tests/summarycode/data/plugin_consolidate/multiple-same-holder-and-license-expected.json @@ -126,7 +126,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "multiple-same-holder-and-license/bar", "start_line": 4, "end_line": 4, @@ -140,7 +140,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "multiple-same-holder-and-license/bar", "start_line": 5, "end_line": 5, @@ -221,7 +221,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "multiple-same-holder-and-license/foo", "start_line": 4, "end_line": 4, @@ -235,7 +235,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "multiple-same-holder-and-license/foo", "start_line": 5, "end_line": 5, diff --git a/tests/summarycode/data/plugin_consolidate/package-files-not-counted-in-license-holders-expected.json b/tests/summarycode/data/plugin_consolidate/package-files-not-counted-in-license-holders-expected.json index 20f2c94655..9b02d55d6c 100644 --- a/tests/summarycode/data/plugin_consolidate/package-files-not-counted-in-license-holders-expected.json +++ b/tests/summarycode/data/plugin_consolidate/package-files-not-counted-in-license-holders-expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-files-not-counted-in-license-holders/package/package.json", "start_line": 1, "end_line": 1, @@ -264,7 +264,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-files-not-counted-in-license-holders/package/package.json", "start_line": 1, "end_line": 1, @@ -311,7 +311,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-files-not-counted-in-license-holders/package/package.json", "start_line": 5, "end_line": 5, @@ -384,7 +384,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-files-not-counted-in-license-holders/package/src1", "start_line": 2, "end_line": 2, @@ -457,7 +457,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-files-not-counted-in-license-holders/package/src2", "start_line": 2, "end_line": 2, @@ -530,7 +530,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-files-not-counted-in-license-holders/package/src3", "start_line": 2, "end_line": 2, @@ -601,7 +601,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-files-not-counted-in-license-holders/src1", "start_line": 2, "end_line": 2, @@ -672,7 +672,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-files-not-counted-in-license-holders/src2", "start_line": 2, "end_line": 2, diff --git a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json index 29ab37289a..3b21d00b72 100644 --- a/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json +++ b/tests/summarycode/data/plugin_consolidate/package-fileset-expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package/package.json", "start_line": 1, "end_line": 1, @@ -229,7 +229,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package/package.json", "start_line": 1, "end_line": 1, @@ -276,7 +276,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package/package.json", "start_line": 4, "end_line": 4, @@ -335,7 +335,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package/src1", "start_line": 2, "end_line": 2, @@ -408,7 +408,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package/src2", "start_line": 2, "end_line": 2, @@ -481,7 +481,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package/src3", "start_line": 2, "end_line": 2, diff --git a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json index c4ce5bd57e..66809170cf 100644 --- a/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json +++ b/tests/summarycode/data/plugin_consolidate/package-manifest-expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-manifest/package.json", "start_line": 1, "end_line": 1, @@ -210,7 +210,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-manifest/package.json", "start_line": 1, "end_line": 1, @@ -257,7 +257,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "package-manifest/package.json", "start_line": 4, "end_line": 4, diff --git a/tests/summarycode/data/plugin_consolidate/report-subdirectory-with-minority-origin-expected.json b/tests/summarycode/data/plugin_consolidate/report-subdirectory-with-minority-origin-expected.json index 96885a9491..91c9c43406 100644 --- a/tests/summarycode/data/plugin_consolidate/report-subdirectory-with-minority-origin-expected.json +++ b/tests/summarycode/data/plugin_consolidate/report-subdirectory-with-minority-origin-expected.json @@ -128,7 +128,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "report-subdirectory-with-minority-origin/b", "start_line": 3, "end_line": 7, @@ -199,7 +199,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "report-subdirectory-with-minority-origin/c", "start_line": 3, "end_line": 7, @@ -270,7 +270,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "report-subdirectory-with-minority-origin/d", "start_line": 3, "end_line": 7, @@ -378,7 +378,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "report-subdirectory-with-minority-origin/minority_holder/a", "start_line": 3, "end_line": 7, diff --git a/tests/summarycode/data/plugin_consolidate/return-nested-local-majority-expected.json b/tests/summarycode/data/plugin_consolidate/return-nested-local-majority-expected.json index 6c60674fa1..622f22ebcd 100644 --- a/tests/summarycode/data/plugin_consolidate/return-nested-local-majority-expected.json +++ b/tests/summarycode/data/plugin_consolidate/return-nested-local-majority-expected.json @@ -213,7 +213,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "return-nested-local-majority/foo/bar", "start_line": 2, "end_line": 2, @@ -227,7 +227,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "return-nested-local-majority/foo/bar", "start_line": 2, "end_line": 2, @@ -298,7 +298,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "return-nested-local-majority/foo/bax", "start_line": 2, "end_line": 2, @@ -312,7 +312,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "return-nested-local-majority/foo/bax", "start_line": 2, "end_line": 2, @@ -420,7 +420,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "return-nested-local-majority/foo/local-majority/baz", "start_line": 2, "end_line": 2, @@ -434,7 +434,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "return-nested-local-majority/foo/local-majority/baz", "start_line": 2, "end_line": 2, @@ -505,7 +505,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "return-nested-local-majority/foo/qux", "start_line": 2, "end_line": 2, @@ -519,7 +519,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "return-nested-local-majority/foo/qux", "start_line": 2, "end_line": 2, diff --git a/tests/summarycode/data/score/basic-expected.json b/tests/summarycode/data/score/basic-expected.json index d9c1955579..709f5e179f 100644 --- a/tests/summarycode/data/score/basic-expected.json +++ b/tests/summarycode/data/score/basic-expected.json @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "basic/package.json", "start_line": 1, "end_line": 1, @@ -434,7 +434,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "basic/README.md", "start_line": 20, "end_line": 37, @@ -509,7 +509,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "basic/index.js", "start_line": 2, "end_line": 19, @@ -608,7 +608,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "basic/package.json", "start_line": 1, "end_line": 1, @@ -804,7 +804,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "basic/package.json", "start_line": 7, "end_line": 7, diff --git a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json index 731ee0dfec..8e2de0e595 100644 --- a/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json +++ b/tests/summarycode/data/score/inconsistent_licenses_copyleft-expected.json @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "inconsistent_licenses_copyleft/package.json", "start_line": 1, "end_line": 1, @@ -456,7 +456,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "inconsistent_licenses_copyleft/README.md", "start_line": 20, "end_line": 37, @@ -531,7 +531,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "inconsistent_licenses_copyleft/index.js", "start_line": 2, "end_line": 19, @@ -630,7 +630,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "inconsistent_licenses_copyleft/package.json", "start_line": 1, "end_line": 1, @@ -826,7 +826,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "inconsistent_licenses_copyleft/package.json", "start_line": 7, "end_line": 7, @@ -895,7 +895,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "inconsistent_licenses_copyleft/util.js", "start_line": 1, "end_line": 1, diff --git a/tests/summarycode/data/score/jar-expected.json b/tests/summarycode/data/score/jar-expected.json index 56433444ee..fd905e27bd 100644 --- a/tests/summarycode/data/score/jar-expected.json +++ b/tests/summarycode/data/score/jar-expected.json @@ -45,7 +45,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "start_line": 1, "end_line": 1, @@ -60,7 +60,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "start_line": 2, "end_line": 2, @@ -503,7 +503,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/LICENSE.txt", "start_line": 2, "end_line": 202, @@ -587,7 +587,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/LICENSE.txt", "start_line": 2, "end_line": 202, @@ -904,7 +904,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "start_line": 1, "end_line": 1, @@ -919,7 +919,7 @@ }, { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "start_line": 2, "end_line": 2, @@ -1073,7 +1073,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/META-INF/maven/org.jboss.logging/jboss-logging/pom.xml", "start_line": 24, "end_line": 30, @@ -1259,7 +1259,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/org/jboss/logging/AbstractLoggerProvider.java", "start_line": 6, "end_line": 16, @@ -1334,7 +1334,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "jar/org/jboss/logging/AbstractMdcLoggerProvider.java", "start_line": 6, "end_line": 16, diff --git a/tests/summarycode/data/score/no_license_ambiguity-expected.json b/tests/summarycode/data/score/no_license_ambiguity-expected.json index dd5203e63d..443a8c8016 100644 --- a/tests/summarycode/data/score/no_license_ambiguity-expected.json +++ b/tests/summarycode/data/score/no_license_ambiguity-expected.json @@ -65,7 +65,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "no_license_ambiguity/Cargo.toml", "start_line": 1, "end_line": 1, @@ -493,7 +493,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "no_license_ambiguity/COPYRIGHT", "start_line": 1, "end_line": 12, @@ -592,7 +592,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "no_license_ambiguity/Cargo.toml", "start_line": 1, "end_line": 1, @@ -756,7 +756,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "no_license_ambiguity/Cargo.toml", "start_line": 5, "end_line": 5, @@ -835,7 +835,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "no_license_ambiguity/LICENSE-APACHE", "start_line": 1, "end_line": 176, @@ -896,7 +896,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "no_license_ambiguity/LICENSE-MIT", "start_line": 4, "end_line": 26, @@ -979,7 +979,7 @@ "matches": [ { "license_expression": "mit OR apache-2.0", - "spdx_license_expression": "MIT OR Apache-2.0", + "license_expression_spdx": "MIT OR Apache-2.0", "from_file": "no_license_ambiguity/README.md", "start_line": 152, "end_line": 158, diff --git a/tests/summarycode/data/score/no_license_text-expected.json b/tests/summarycode/data/score/no_license_text-expected.json index e12af846ab..71b73269bf 100644 --- a/tests/summarycode/data/score/no_license_text-expected.json +++ b/tests/summarycode/data/score/no_license_text-expected.json @@ -53,7 +53,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "no_license_text/package.json", "start_line": 1, "end_line": 1, @@ -530,7 +530,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "no_license_text/package.json", "start_line": 1, "end_line": 1, @@ -726,7 +726,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "no_license_text/package.json", "start_line": 7, "end_line": 7, diff --git a/tests/summarycode/data/summary/conflicting_license_categories/conflicting_license_categories.expected.json b/tests/summarycode/data/summary/conflicting_license_categories/conflicting_license_categories.expected.json index 44dc1cc7cf..09cb9f607e 100644 --- a/tests/summarycode/data/summary/conflicting_license_categories/conflicting_license_categories.expected.json +++ b/tests/summarycode/data/summary/conflicting_license_categories/conflicting_license_categories.expected.json @@ -306,7 +306,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/apache-2.0.LICENSE", "start_line": 1, "end_line": 176, @@ -367,7 +367,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "codebase/mit.LICENSE", "start_line": 1, "end_line": 18, @@ -467,7 +467,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/src/a.py", "start_line": 3, "end_line": 3, @@ -481,7 +481,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "codebase/src/a.py", "start_line": 3, "end_line": 3, @@ -603,7 +603,7 @@ "matches": [ { "license_expression": "gpl-1.0-plus", - "spdx_license_expression": "GPL-1.0-or-later", + "license_expression_spdx": "GPL-1.0-or-later", "from_file": "codebase/tests/test_a.py", "start_line": 2, "end_line": 2, @@ -617,7 +617,7 @@ }, { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "codebase/tests/test_a.py", "start_line": 2, "end_line": 2, @@ -631,7 +631,7 @@ }, { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "codebase/tests/test_a.py", "start_line": 2, "end_line": 2, diff --git a/tests/summarycode/data/summary/embedded_packages/bunkerweb.expected.json b/tests/summarycode/data/summary/embedded_packages/bunkerweb.expected.json index 66801f6ebe..d72f6a3b73 100644 --- a/tests/summarycode/data/summary/embedded_packages/bunkerweb.expected.json +++ b/tests/summarycode/data/summary/embedded_packages/bunkerweb.expected.json @@ -72,7 +72,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "bunkerweb/LICENSE.md", "start_line": 4, "end_line": 21, @@ -334,7 +334,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "bunkerweb/LICENSE.md", "start_line": 4, "end_line": 21, @@ -487,7 +487,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "bunkerweb/deps/libinjection/COPYING.txt", "start_line": 4, "end_line": 29, @@ -501,7 +501,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "bunkerweb/deps/libinjection/COPYING.txt", "start_line": 32, "end_line": 32, @@ -608,7 +608,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "bunkerweb/deps/libinjection/setup.py", "start_line": 1, "end_line": 1, @@ -660,7 +660,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "bunkerweb/deps/libinjection/setup.py", "start_line": 6, "end_line": 6, @@ -674,7 +674,7 @@ }, { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "bunkerweb/deps/libinjection/setup.py", "start_line": 6, "end_line": 6, @@ -688,7 +688,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "bunkerweb/deps/libinjection/COPYING.txt", "start_line": 4, "end_line": 29, @@ -702,7 +702,7 @@ }, { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "bunkerweb/deps/libinjection/COPYING.txt", "start_line": 32, "end_line": 32, @@ -726,7 +726,7 @@ "matches": [ { "license_expression": "bsd-new", - "spdx_license_expression": "BSD-3-Clause", + "license_expression_spdx": "BSD-3-Clause", "from_file": "bunkerweb/deps/libinjection/setup.py", "start_line": 41, "end_line": 41, @@ -831,7 +831,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "bunkerweb/LICENSE.md", "start_line": 4, "end_line": 21, diff --git a/tests/summarycode/data/summary/end-2-end/bug-1141.expected.json b/tests/summarycode/data/summary/end-2-end/bug-1141.expected.json index 1603b97fe3..5e8a0f4494 100644 --- a/tests/summarycode/data/summary/end-2-end/bug-1141.expected.json +++ b/tests/summarycode/data/summary/end-2-end/bug-1141.expected.json @@ -274,7 +274,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING", "start_line": 1, "end_line": 12, @@ -491,7 +491,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "bug-1141.tar.gz/bug/sub/sub2/src/benchmark.c", "start_line": 8, "end_line": 19, diff --git a/tests/summarycode/data/summary/holders/clear_holder.expected.json b/tests/summarycode/data/summary/holders/clear_holder.expected.json index 031e9449ed..175440f1f4 100644 --- a/tests/summarycode/data/summary/holders/clear_holder.expected.json +++ b/tests/summarycode/data/summary/holders/clear_holder.expected.json @@ -193,7 +193,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "clear_holder/README.txt", "start_line": 3, "end_line": 3, @@ -207,7 +207,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "clear_holder/README.txt", "start_line": 3, "end_line": 3, @@ -290,7 +290,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "clear_holder/apache-2.0.LICENSE", "start_line": 1, "end_line": 176, @@ -351,7 +351,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "clear_holder/mit.LICENSE", "start_line": 1, "end_line": 18, @@ -451,7 +451,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "clear_holder/src/a.py", "start_line": 2, "end_line": 2, @@ -465,7 +465,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "clear_holder/src/a.py", "start_line": 2, "end_line": 2, @@ -577,7 +577,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "clear_holder/tests/test_a.py", "start_line": 2, "end_line": 2, @@ -591,7 +591,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "clear_holder/tests/test_a.py", "start_line": 2, "end_line": 2, diff --git a/tests/summarycode/data/summary/holders/combined_holders.expected.json b/tests/summarycode/data/summary/holders/combined_holders.expected.json index 3a038bc348..725841b9cc 100644 --- a/tests/summarycode/data/summary/holders/combined_holders.expected.json +++ b/tests/summarycode/data/summary/holders/combined_holders.expected.json @@ -189,7 +189,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "combined_holders/README.txt", "start_line": 3, "end_line": 3, @@ -203,7 +203,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "combined_holders/README.txt", "start_line": 3, "end_line": 3, @@ -286,7 +286,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "combined_holders/apache-2.0.LICENSE", "start_line": 1, "end_line": 176, @@ -347,7 +347,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "combined_holders/mit.LICENSE", "start_line": 1, "end_line": 18, @@ -447,7 +447,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "combined_holders/src/a.py", "start_line": 1, "end_line": 1, @@ -461,7 +461,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "combined_holders/src/a.py", "start_line": 1, "end_line": 1, @@ -561,7 +561,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "combined_holders/tests/test_a.py", "start_line": 1, "end_line": 1, @@ -575,7 +575,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "combined_holders/tests/test_a.py", "start_line": 1, "end_line": 1, diff --git a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json index 318db8db4d..8b8cc425d3 100644 --- a/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json +++ b/tests/summarycode/data/summary/license_ambiguity/ambiguous.expected.json @@ -208,7 +208,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "ambiguous/apache-2.0.LICENSE", "start_line": 1, "end_line": 176, @@ -269,7 +269,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "ambiguous/mit.LICENSE", "start_line": 1, "end_line": 18, diff --git a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json index c79eb04ae1..ac7d5abd69 100644 --- a/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json +++ b/tests/summarycode/data/summary/license_ambiguity/unambiguous.expected.json @@ -189,7 +189,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "unambiguous/README.txt", "start_line": 3, "end_line": 3, @@ -203,7 +203,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "unambiguous/README.txt", "start_line": 3, "end_line": 3, @@ -276,7 +276,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "unambiguous/apache-2.0.LICENSE", "start_line": 1, "end_line": 176, @@ -337,7 +337,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "unambiguous/mit.LICENSE", "start_line": 1, "end_line": 18, diff --git a/tests/summarycode/data/summary/multiple_package_data/multiple_package_data.expected.json b/tests/summarycode/data/summary/multiple_package_data/multiple_package_data.expected.json index 6f68a82df2..84ad322e3d 100644 --- a/tests/summarycode/data/summary/multiple_package_data/multiple_package_data.expected.json +++ b/tests/summarycode/data/summary/multiple_package_data/multiple_package_data.expected.json @@ -76,7 +76,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "codebase/cargo.toml", "start_line": 1, "end_line": 1, @@ -155,7 +155,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/setup.py", "start_line": 1, "end_line": 1, @@ -442,7 +442,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/README.txt", "start_line": 3, "end_line": 3, @@ -456,7 +456,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "codebase/README.txt", "start_line": 3, "end_line": 3, @@ -531,7 +531,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/apache-2.0.LICENSE", "start_line": 1, "end_line": 176, @@ -618,7 +618,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "codebase/cargo.toml", "start_line": 1, "end_line": 1, @@ -671,7 +671,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "codebase/cargo.toml", "start_line": 4, "end_line": 4, @@ -740,7 +740,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "codebase/mit.LICENSE", "start_line": 1, "end_line": 18, @@ -827,7 +827,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/setup.py", "start_line": 1, "end_line": 1, @@ -879,7 +879,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/setup.py", "start_line": 3, "end_line": 3, diff --git a/tests/summarycode/data/summary/single_file/single_file.expected.json b/tests/summarycode/data/summary/single_file/single_file.expected.json index f2e8d96b72..a5b8517f8a 100644 --- a/tests/summarycode/data/summary/single_file/single_file.expected.json +++ b/tests/summarycode/data/summary/single_file/single_file.expected.json @@ -117,7 +117,7 @@ "matches": [ { "license_expression": "jetty", - "spdx_license_expression": "LicenseRef-scancode-jetty", + "license_expression_spdx": "LicenseRef-scancode-jetty", "from_file": "codebase/jetty.LICENSE", "start_line": 1, "end_line": 132, diff --git a/tests/summarycode/data/summary/summary_without_holder/summary-without-holder-pypi.expected.json b/tests/summarycode/data/summary/summary_without_holder/summary-without-holder-pypi.expected.json index 88f3105fbb..2355fb4d4c 100644 --- a/tests/summarycode/data/summary/summary_without_holder/summary-without-holder-pypi.expected.json +++ b/tests/summarycode/data/summary/summary_without_holder/summary-without-holder-pypi.expected.json @@ -68,7 +68,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -90,7 +90,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -403,7 +403,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -511,7 +511,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -533,7 +533,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 1, "end_line": 1, @@ -588,7 +588,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 6, "end_line": 6, @@ -609,7 +609,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 13, "end_line": 13, @@ -630,7 +630,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "pip-22.0.4/PKG-INFO", "start_line": 25, "end_line": 25, @@ -644,7 +644,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -1000,7 +1000,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "pip-22.0.4/setup.cfg", "start_line": 87, "end_line": 87, @@ -1014,7 +1014,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -1028,7 +1028,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -1082,7 +1082,7 @@ "matches": [ { "license_expression": "unknown-license-reference", - "spdx_license_expression": "LicenseRef-scancode-unknown-license-reference", + "license_expression_spdx": "LicenseRef-scancode-unknown-license-reference", "from_file": "pip-22.0.4/setup.cfg", "start_line": 87, "end_line": 87, @@ -1096,7 +1096,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -1110,7 +1110,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/LICENSE.txt", "start_line": 3, "end_line": 20, @@ -1183,7 +1183,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/setup.py", "start_line": 1, "end_line": 1, @@ -1205,7 +1205,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/setup.py", "start_line": 1, "end_line": 1, @@ -1261,7 +1261,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/setup.py", "start_line": 31, "end_line": 31, @@ -1275,7 +1275,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "pip-22.0.4/setup.py", "start_line": 35, "end_line": 35, diff --git a/tests/summarycode/data/summary/use_holder_from_package_resource/use_holder_from_package_resource.expected.json b/tests/summarycode/data/summary/use_holder_from_package_resource/use_holder_from_package_resource.expected.json index acb1757d3d..6f54e573e6 100644 --- a/tests/summarycode/data/summary/use_holder_from_package_resource/use_holder_from_package_resource.expected.json +++ b/tests/summarycode/data/summary/use_holder_from_package_resource/use_holder_from_package_resource.expected.json @@ -68,7 +68,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/setup.py", "start_line": 4, "end_line": 14, @@ -301,7 +301,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/setup.py", "start_line": 4, "end_line": 14, @@ -364,7 +364,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/setup.py", "start_line": 4, "end_line": 14, diff --git a/tests/summarycode/data/summary/with_package_data/with_package_data.expected.json b/tests/summarycode/data/summary/with_package_data/with_package_data.expected.json index 319b9c07ae..17dda5f5b2 100644 --- a/tests/summarycode/data/summary/with_package_data/with_package_data.expected.json +++ b/tests/summarycode/data/summary/with_package_data/with_package_data.expected.json @@ -72,7 +72,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/setup.py", "start_line": 1, "end_line": 1, @@ -315,7 +315,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/README.txt", "start_line": 3, "end_line": 3, @@ -329,7 +329,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "codebase/README.txt", "start_line": 3, "end_line": 3, @@ -404,7 +404,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/apache-2.0.LICENSE", "start_line": 1, "end_line": 176, @@ -467,7 +467,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "codebase/mit.LICENSE", "start_line": 1, "end_line": 18, @@ -554,7 +554,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/setup.py", "start_line": 1, "end_line": 1, @@ -606,7 +606,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/setup.py", "start_line": 3, "end_line": 3, diff --git a/tests/summarycode/data/summary/without_package_data/without_package_data.expected.json b/tests/summarycode/data/summary/without_package_data/without_package_data.expected.json index 384de11f4f..10e2278657 100644 --- a/tests/summarycode/data/summary/without_package_data/without_package_data.expected.json +++ b/tests/summarycode/data/summary/without_package_data/without_package_data.expected.json @@ -189,7 +189,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/README.txt", "start_line": 3, "end_line": 3, @@ -203,7 +203,7 @@ }, { "license_expression": "apache-2.0 OR mit", - "spdx_license_expression": "Apache-2.0 OR MIT", + "license_expression_spdx": "Apache-2.0 OR MIT", "from_file": "codebase/README.txt", "start_line": 3, "end_line": 3, @@ -276,7 +276,7 @@ "matches": [ { "license_expression": "apache-2.0", - "spdx_license_expression": "Apache-2.0", + "license_expression_spdx": "Apache-2.0", "from_file": "codebase/apache-2.0.LICENSE", "start_line": 1, "end_line": 176, @@ -337,7 +337,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "codebase/mit.LICENSE", "start_line": 1, "end_line": 18, diff --git a/tests/summarycode/data/tallies/end-2-end/bug-1141.expected.json b/tests/summarycode/data/tallies/end-2-end/bug-1141.expected.json index 8996d0769b..a372443b23 100644 --- a/tests/summarycode/data/tallies/end-2-end/bug-1141.expected.json +++ b/tests/summarycode/data/tallies/end-2-end/bug-1141.expected.json @@ -307,7 +307,7 @@ "matches": [ { "license_expression": "gpl-3.0-plus", - "spdx_license_expression": "GPL-3.0-or-later", + "license_expression_spdx": "GPL-3.0-or-later", "from_file": "bug-1141.tar.gz/bug/sub/sub2/COPYING", "start_line": 1, "end_line": 12, @@ -533,7 +533,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus", - "spdx_license_expression": "GPL-2.0-or-later", + "license_expression_spdx": "GPL-2.0-or-later", "from_file": "bug-1141.tar.gz/bug/sub/sub2/src/benchmark.c", "start_line": 8, "end_line": 19, diff --git a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json index 052f2d714b..155199a359 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies.expected.json @@ -2216,7 +2216,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -4011,7 +4011,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/FixedMembershipToken.java", "start_line": 7, "end_line": 20, @@ -4081,7 +4081,7 @@ "matches": [ { "license_expression": "cc-by-2.5", - "spdx_license_expression": "CC-BY-2.5", + "license_expression_spdx": "CC-BY-2.5", "from_file": "scan/JGroups/src/GuardedBy.java", "start_line": 4, "end_line": 5, @@ -4157,7 +4157,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/ImmutableReference.java", "start_line": 7, "end_line": 20, @@ -4311,7 +4311,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/RouterStubManager.java", "start_line": 7, "end_line": 20, @@ -4495,7 +4495,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/adler32.c", "start_line": 3, "end_line": 3, @@ -4509,7 +4509,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -4582,7 +4582,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -4652,7 +4652,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zutil.h", "start_line": 3, "end_line": 3, @@ -4666,7 +4666,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -4739,7 +4739,7 @@ "matches": [ { "license_expression": "cc0-1.0", - "spdx_license_expression": "CC0-1.0", + "license_expression_spdx": "CC0-1.0", "from_file": "scan/cc0-1.0.LICENSE", "start_line": 1, "end_line": 98, @@ -7001,7 +7001,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -7896,7 +7896,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 198, "end_line": 198, @@ -8032,7 +8032,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus WITH ada-linking-exception", - "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception", + "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception", "from_file": "scan/zlib/ada/zlib.ads", "start_line": 6, "end_line": 25, @@ -8102,7 +8102,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/adler32.c", "start_line": 3, "end_line": 3, @@ -8116,7 +8116,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -8189,7 +8189,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/deflate.c", "start_line": 3, "end_line": 3, @@ -8203,7 +8203,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -8276,7 +8276,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/deflate.h", "start_line": 3, "end_line": 3, @@ -8290,7 +8290,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -8447,7 +8447,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs", "start_line": 4, "end_line": 5, @@ -8553,7 +8553,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S", "start_line": 17, "end_line": 31, @@ -8665,7 +8665,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/infback9/infback9.c", "start_line": 3, "end_line": 3, @@ -8735,7 +8735,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/infback9/infback9.h", "start_line": 3, "end_line": 3, @@ -8841,7 +8841,7 @@ "matches": [ { "license_expression": "mit-old-style", - "spdx_license_expression": "LicenseRef-scancode-mit-old-style", + "license_expression_spdx": "LicenseRef-scancode-mit-old-style", "from_file": "scan/zlib/iostream2/zstream.h", "start_line": 9, "end_line": 15, @@ -8911,7 +8911,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -8981,7 +8981,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zutil.c", "start_line": 3, "end_line": 3, @@ -8995,7 +8995,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -9068,7 +9068,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zutil.h", "start_line": 3, "end_line": 3, @@ -9082,7 +9082,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, diff --git a/tests/summarycode/data/tallies/full_tallies/tallies_by_facet.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies_by_facet.expected.json index 22918fee83..9f2ed46503 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies_by_facet.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies_by_facet.expected.json @@ -2216,7 +2216,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -4273,7 +4273,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/FixedMembershipToken.java", "start_line": 7, "end_line": 20, @@ -4354,7 +4354,7 @@ "matches": [ { "license_expression": "cc-by-2.5", - "spdx_license_expression": "CC-BY-2.5", + "license_expression_spdx": "CC-BY-2.5", "from_file": "scan/JGroups/src/GuardedBy.java", "start_line": 4, "end_line": 5, @@ -4446,7 +4446,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/ImmutableReference.java", "start_line": 7, "end_line": 20, @@ -4621,7 +4621,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/RouterStubManager.java", "start_line": 7, "end_line": 20, @@ -4840,7 +4840,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/adler32.c", "start_line": 3, "end_line": 3, @@ -4854,7 +4854,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -4932,7 +4932,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -5024,7 +5024,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zutil.h", "start_line": 3, "end_line": 3, @@ -5038,7 +5038,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -5116,7 +5116,7 @@ "matches": [ { "license_expression": "cc0-1.0", - "spdx_license_expression": "CC0-1.0", + "license_expression_spdx": "CC0-1.0", "from_file": "scan/cc0-1.0.LICENSE", "start_line": 1, "end_line": 98, @@ -7383,7 +7383,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -8278,7 +8278,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 198, "end_line": 198, @@ -8707,7 +8707,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus WITH ada-linking-exception", - "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception", + "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception", "from_file": "scan/zlib/ada/zlib.ads", "start_line": 6, "end_line": 25, @@ -8782,7 +8782,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/adler32.c", "start_line": 3, "end_line": 3, @@ -8796,7 +8796,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -8874,7 +8874,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/deflate.c", "start_line": 3, "end_line": 3, @@ -8888,7 +8888,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -8966,7 +8966,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/deflate.h", "start_line": 3, "end_line": 3, @@ -8980,7 +8980,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -9150,7 +9150,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs", "start_line": 4, "end_line": 5, @@ -9270,7 +9270,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S", "start_line": 17, "end_line": 31, @@ -9406,7 +9406,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/infback9/infback9.c", "start_line": 3, "end_line": 3, @@ -9481,7 +9481,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/infback9/infback9.h", "start_line": 3, "end_line": 3, @@ -9595,7 +9595,7 @@ "matches": [ { "license_expression": "mit-old-style", - "spdx_license_expression": "LicenseRef-scancode-mit-old-style", + "license_expression_spdx": "LicenseRef-scancode-mit-old-style", "from_file": "scan/zlib/iostream2/zstream.h", "start_line": 9, "end_line": 15, @@ -9676,7 +9676,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -9762,7 +9762,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zutil.c", "start_line": 3, "end_line": 3, @@ -9776,7 +9776,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -9854,7 +9854,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zutil.h", "start_line": 3, "end_line": 3, @@ -9868,7 +9868,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, diff --git a/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json index d72238fd1a..127f4da2db 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies_details.expected.json @@ -2216,7 +2216,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -4343,7 +4343,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/FixedMembershipToken.java", "start_line": 7, "end_line": 20, @@ -4445,7 +4445,7 @@ "matches": [ { "license_expression": "cc-by-2.5", - "spdx_license_expression": "CC-BY-2.5", + "license_expression_spdx": "CC-BY-2.5", "from_file": "scan/JGroups/src/GuardedBy.java", "start_line": 4, "end_line": 5, @@ -4553,7 +4553,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/ImmutableReference.java", "start_line": 7, "end_line": 20, @@ -4803,7 +4803,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/RouterStubManager.java", "start_line": 7, "end_line": 20, @@ -5131,7 +5131,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/adler32.c", "start_line": 3, "end_line": 3, @@ -5145,7 +5145,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -5250,7 +5250,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -5352,7 +5352,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zutil.h", "start_line": 3, "end_line": 3, @@ -5366,7 +5366,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -5471,7 +5471,7 @@ "matches": [ { "license_expression": "cc0-1.0", - "spdx_license_expression": "CC0-1.0", + "license_expression_spdx": "CC0-1.0", "from_file": "scan/cc0-1.0.LICENSE", "start_line": 1, "end_line": 98, @@ -7765,7 +7765,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 1, "end_line": 1, @@ -8660,7 +8660,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 198, "end_line": 198, @@ -8967,7 +8967,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus WITH ada-linking-exception", - "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception", + "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception", "from_file": "scan/zlib/ada/zlib.ads", "start_line": 6, "end_line": 25, @@ -9069,7 +9069,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/adler32.c", "start_line": 3, "end_line": 3, @@ -9083,7 +9083,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -9188,7 +9188,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/deflate.c", "start_line": 3, "end_line": 3, @@ -9202,7 +9202,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -9307,7 +9307,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/deflate.h", "start_line": 3, "end_line": 3, @@ -9321,7 +9321,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -9582,7 +9582,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs", "start_line": 4, "end_line": 5, @@ -9752,7 +9752,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S", "start_line": 17, "end_line": 31, @@ -9928,7 +9928,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/infback9/infback9.c", "start_line": 3, "end_line": 3, @@ -10030,7 +10030,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/infback9/infback9.h", "start_line": 3, "end_line": 3, @@ -10200,7 +10200,7 @@ "matches": [ { "license_expression": "mit-old-style", - "spdx_license_expression": "LicenseRef-scancode-mit-old-style", + "license_expression_spdx": "LicenseRef-scancode-mit-old-style", "from_file": "scan/zlib/iostream2/zstream.h", "start_line": 9, "end_line": 15, @@ -10302,7 +10302,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -10404,7 +10404,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zutil.c", "start_line": 3, "end_line": 3, @@ -10418,7 +10418,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -10523,7 +10523,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zutil.h", "start_line": 3, "end_line": 3, @@ -10537,7 +10537,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, diff --git a/tests/summarycode/data/tallies/full_tallies/tallies_key_files-details.expected.json-lines b/tests/summarycode/data/tallies/full_tallies/tallies_key_files-details.expected.json-lines index 36585556eb..71e68b8f82 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies_key_files-details.expected.json-lines +++ b/tests/summarycode/data/tallies/full_tallies/tallies_key_files-details.expected.json-lines @@ -14,7 +14,7 @@ "--tallies-key-files": true }, "notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.", - "output_format_version": "3.0.0", + "output_format_version": "3.2.0", "message": null, "errors": [], "warnings": [], @@ -22,11 +22,11 @@ "system_environment": { "operating_system": "linux", "cpu_architecture": "64", - "platform": "Linux-5.15.0-89-generic-x86_64-with-glibc2.29", - "platform_version": "#99~20.04.1-Ubuntu SMP Thu Nov 2 15:16:47 UTC 2023", - "python_version": "3.8.10 (default, Nov 22 2023, 10:22:35) \n[GCC 9.4.0]" + "platform": "Linux-5.15.0-113-generic-x86_64-with-glibc2.35", + "platform_version": "#123-Ubuntu SMP Mon Jun 10 08:16:17 UTC 2024", + "python_version": "3.10.12 (main, Nov 20 2023, 15:14:05) [GCC 11.4.0]" }, - "spdx_license_list_version": "3.22", + "spdx_license_list_version": "3.24", "files_count": 26 } } @@ -573,7 +573,7 @@ "matches": [ { "license_expression": "cc0-1.0", - "spdx_license_expression": "CC0-1.0", + "license_expression_spdx": "CC0-1.0", "from_file": "scan/cc0-1.0.LICENSE", "start_line": 1, "end_line": 98, @@ -636,7 +636,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 198, "end_line": 198, @@ -787,7 +787,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/adler32.c", "start_line": 3, "end_line": 3, @@ -801,7 +801,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -879,7 +879,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -954,7 +954,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zutil.h", "start_line": 3, "end_line": 3, @@ -968,7 +968,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -1128,7 +1128,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/FixedMembershipToken.java", "start_line": 7, "end_line": 20, @@ -1203,7 +1203,7 @@ "matches": [ { "license_expression": "cc-by-2.5", - "spdx_license_expression": "CC-BY-2.5", + "license_expression_spdx": "CC-BY-2.5", "from_file": "scan/JGroups/src/GuardedBy.java", "start_line": 4, "end_line": 5, @@ -1284,7 +1284,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/ImmutableReference.java", "start_line": 7, "end_line": 20, @@ -1453,7 +1453,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/RouterStubManager.java", "start_line": 7, "end_line": 20, @@ -1616,7 +1616,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/adler32.c", "start_line": 3, "end_line": 3, @@ -1630,7 +1630,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -1708,7 +1708,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/deflate.c", "start_line": 3, "end_line": 3, @@ -1722,7 +1722,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -1800,7 +1800,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/deflate.h", "start_line": 3, "end_line": 3, @@ -1814,7 +1814,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -1892,7 +1892,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -1967,7 +1967,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zutil.c", "start_line": 3, "end_line": 3, @@ -1981,7 +1981,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -2059,7 +2059,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zutil.h", "start_line": 3, "end_line": 3, @@ -2073,7 +2073,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -2192,7 +2192,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus WITH ada-linking-exception", - "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception", + "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception", "from_file": "scan/zlib/ada/zlib.ads", "start_line": 6, "end_line": 25, @@ -2361,7 +2361,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs", "start_line": 4, "end_line": 5, @@ -2477,7 +2477,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S", "start_line": 17, "end_line": 31, @@ -2599,7 +2599,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/infback9/infback9.c", "start_line": 3, "end_line": 3, @@ -2674,7 +2674,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/infback9/infback9.h", "start_line": 3, "end_line": 3, @@ -2790,7 +2790,7 @@ "matches": [ { "license_expression": "mit-old-style", - "spdx_license_expression": "LicenseRef-scancode-mit-old-style", + "license_expression_spdx": "LicenseRef-scancode-mit-old-style", "from_file": "scan/zlib/iostream2/zstream.h", "start_line": 9, "end_line": 15, diff --git a/tests/summarycode/data/tallies/full_tallies/tallies_key_files.expected.json b/tests/summarycode/data/tallies/full_tallies/tallies_key_files.expected.json index 417fd47968..82c3d19a74 100644 --- a/tests/summarycode/data/tallies/full_tallies/tallies_key_files.expected.json +++ b/tests/summarycode/data/tallies/full_tallies/tallies_key_files.expected.json @@ -603,7 +603,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/FixedMembershipToken.java", "start_line": 7, "end_line": 20, @@ -674,7 +674,7 @@ "matches": [ { "license_expression": "cc-by-2.5", - "spdx_license_expression": "CC-BY-2.5", + "license_expression_spdx": "CC-BY-2.5", "from_file": "scan/JGroups/src/GuardedBy.java", "start_line": 4, "end_line": 5, @@ -751,7 +751,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/ImmutableReference.java", "start_line": 7, "end_line": 20, @@ -908,7 +908,7 @@ "matches": [ { "license_expression": "lgpl-2.1-plus", - "spdx_license_expression": "LGPL-2.1-or-later", + "license_expression_spdx": "LGPL-2.1-or-later", "from_file": "scan/JGroups/src/RouterStubManager.java", "start_line": 7, "end_line": 20, @@ -1096,7 +1096,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/adler32.c", "start_line": 3, "end_line": 3, @@ -1110,7 +1110,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -1184,7 +1184,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -1255,7 +1255,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zutil.h", "start_line": 3, "end_line": 3, @@ -1269,7 +1269,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/arch/zlib.h", "start_line": 6, "end_line": 23, @@ -1343,7 +1343,7 @@ "matches": [ { "license_expression": "cc0-1.0", - "spdx_license_expression": "CC0-1.0", + "license_expression_spdx": "CC0-1.0", "from_file": "scan/cc0-1.0.LICENSE", "start_line": 1, "end_line": 98, @@ -1402,7 +1402,7 @@ "matches": [ { "license_expression": "artistic-2.0", - "spdx_license_expression": "Artistic-2.0", + "license_expression_spdx": "Artistic-2.0", "from_file": "scan/package.json", "start_line": 198, "end_line": 198, @@ -1541,7 +1541,7 @@ "matches": [ { "license_expression": "gpl-2.0-plus WITH ada-linking-exception", - "spdx_license_expression": "GPL-2.0-or-later WITH GNAT-exception", + "license_expression_spdx": "GPL-2.0-or-later WITH GNAT-exception", "from_file": "scan/zlib/ada/zlib.ads", "start_line": 6, "end_line": 25, @@ -1612,7 +1612,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/adler32.c", "start_line": 3, "end_line": 3, @@ -1626,7 +1626,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -1700,7 +1700,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/deflate.c", "start_line": 3, "end_line": 3, @@ -1714,7 +1714,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -1788,7 +1788,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/deflate.h", "start_line": 3, "end_line": 3, @@ -1802,7 +1802,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -1962,7 +1962,7 @@ "matches": [ { "license_expression": "boost-1.0", - "spdx_license_expression": "BSL-1.0", + "license_expression_spdx": "BSL-1.0", "from_file": "scan/zlib/dotzlib/ChecksumImpl.cs", "start_line": 4, "end_line": 5, @@ -2070,7 +2070,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/gcc_gvmat64/gvmat64.S", "start_line": 17, "end_line": 31, @@ -2184,7 +2184,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/infback9/infback9.c", "start_line": 3, "end_line": 3, @@ -2255,7 +2255,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/infback9/infback9.h", "start_line": 3, "end_line": 3, @@ -2363,7 +2363,7 @@ "matches": [ { "license_expression": "mit-old-style", - "spdx_license_expression": "LicenseRef-scancode-mit-old-style", + "license_expression_spdx": "LicenseRef-scancode-mit-old-style", "from_file": "scan/zlib/iostream2/zstream.h", "start_line": 9, "end_line": 15, @@ -2434,7 +2434,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -2505,7 +2505,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zutil.c", "start_line": 3, "end_line": 3, @@ -2519,7 +2519,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, @@ -2593,7 +2593,7 @@ "matches": [ { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zutil.h", "start_line": 3, "end_line": 3, @@ -2607,7 +2607,7 @@ }, { "license_expression": "zlib", - "spdx_license_expression": "Zlib", + "license_expression_spdx": "Zlib", "from_file": "scan/zlib/zlib.h", "start_line": 6, "end_line": 23, diff --git a/tests/summarycode/data/tallies/packages/expected.json b/tests/summarycode/data/tallies/packages/expected.json index dd727739dc..e1cadcd0eb 100644 --- a/tests/summarycode/data/tallies/packages/expected.json +++ b/tests/summarycode/data/tallies/packages/expected.json @@ -33,7 +33,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "scan/aopalliance/aopalliance/1.0/aopalliance-1.0.pom", "start_line": 1, "end_line": 1, @@ -119,7 +119,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "scan/freebsd/basic/+COMPACT_MANIFEST", "start_line": 1, "end_line": 1, @@ -198,7 +198,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/scoped1/package.json", "start_line": 1, "end_line": 1, @@ -1223,7 +1223,7 @@ "matches": [ { "license_expression": "public-domain", - "spdx_license_expression": "LicenseRef-scancode-public-domain", + "license_expression_spdx": "LicenseRef-scancode-public-domain", "from_file": "scan/aopalliance/aopalliance/1.0/aopalliance-1.0.pom", "start_line": 1, "end_line": 1, @@ -1329,7 +1329,7 @@ "matches": [ { "license_expression": "gpl-2.0", - "spdx_license_expression": "GPL-2.0-only", + "license_expression_spdx": "GPL-2.0-only", "from_file": "scan/freebsd/basic/+COMPACT_MANIFEST", "start_line": 1, "end_line": 1, @@ -1421,7 +1421,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "scan/scoped1/package.json", "start_line": 1, "end_line": 1, diff --git a/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json b/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json index 27658ae064..f0c045768f 100644 --- a/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json +++ b/tests/summarycode/data/todo/no_todo/base64-arraybuffer.expected.json @@ -41,7 +41,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "base64-arraybuffer-0.1.4/package.json", "start_line": 1, "end_line": 1, @@ -63,7 +63,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "base64-arraybuffer-0.1.4/package.json", "start_line": 1, "end_line": 1, @@ -415,7 +415,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "base64-arraybuffer-0.1.4/LICENSE-MIT", "start_line": 3, "end_line": 22, @@ -486,7 +486,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "base64-arraybuffer-0.1.4/README.md", "start_line": 20, "end_line": 20, @@ -594,7 +594,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "base64-arraybuffer-0.1.4/lib/base64-arraybuffer.js", "start_line": 6, "end_line": 6, @@ -694,7 +694,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "base64-arraybuffer-0.1.4/package.json", "start_line": 1, "end_line": 1, @@ -716,7 +716,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "base64-arraybuffer-0.1.4/package.json", "start_line": 1, "end_line": 1, @@ -823,7 +823,7 @@ "matches": [ { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "base64-arraybuffer-0.1.4/package.json", "start_line": 18, "end_line": 20, @@ -837,7 +837,7 @@ }, { "license_expression": "mit", - "spdx_license_expression": "MIT", + "license_expression_spdx": "MIT", "from_file": "base64-arraybuffer-0.1.4/package.json", "start_line": 21, "end_line": 21, diff --git a/tests/summarycode/data/todo/todo_present/README.multi-orig-tarball-package-expected-diag.json b/tests/summarycode/data/todo/todo_present/README.multi-orig-tarball-package-expected-diag.json index ccda031a68..460579ef29 100644 --- a/tests/summarycode/data/todo/todo_present/README.multi-orig-tarball-package-expected-diag.json +++ b/tests/summarycode/data/todo/todo_present/README.multi-orig-tarball-package-expected-diag.json @@ -48,7 +48,7 @@ "license_clues": [ { "license_expression": "borceux", - "spdx_license_expression": "Borceux", + "license_expression_spdx": "Borceux", "from_file": "README.multi-orig-tarball-package", "start_line": 1, "end_line": 3, diff --git a/tests/summarycode/data/todo/todo_present/unknown-license-expected-diag.json b/tests/summarycode/data/todo/todo_present/unknown-license-expected-diag.json index 047eb0ba37..38aa62d80e 100644 --- a/tests/summarycode/data/todo/todo_present/unknown-license-expected-diag.json +++ b/tests/summarycode/data/todo/todo_present/unknown-license-expected-diag.json @@ -79,7 +79,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "unknown-license.txt", "start_line": 1, "end_line": 10, diff --git a/tests/summarycode/data/todo/todo_present/unknown-license-expected.json b/tests/summarycode/data/todo/todo_present/unknown-license-expected.json index 2938c88636..09057a3489 100644 --- a/tests/summarycode/data/todo/todo_present/unknown-license-expected.json +++ b/tests/summarycode/data/todo/todo_present/unknown-license-expected.json @@ -73,7 +73,7 @@ "matches": [ { "license_expression": "unknown", - "spdx_license_expression": "LicenseRef-scancode-unknown", + "license_expression_spdx": "LicenseRef-scancode-unknown", "from_file": "unknown-license.txt", "start_line": 1, "end_line": 10,